diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index f7a4e7a013..71a3b669dd 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -8,7 +8,9 @@ if is_windows
     subdir_done()
 endif
 
+headers = files('rte_pmd_bnxt.h')
 cflags_options = [
+        '-DRTE_LIBRTE_BNXT_TF',
         '-DSUPPORT_CFA_HW_ALL=1',
 ]
 
diff --git a/drivers/net/bnxt/tf_core/tf_core.h b/drivers/net/bnxt/tf_core/tf_core.h
index 0b06bb2bb5..be5725a66a 100644
--- a/drivers/net/bnxt/tf_core/tf_core.h
+++ b/drivers/net/bnxt/tf_core/tf_core.h
@@ -1104,10 +1104,6 @@ struct tf_alloc_tbl_scope_parms {
 	 * [in] Number of flows * 1000. If set, rx_mem_size_in_mb must equal 0.
 	 */
 	uint32_t rx_num_flows_in_k;
-	/**
-	 * [in] SR2 only receive table access interface id
-	 */
-	uint32_t rx_tbl_if_id;
 	/**
 	 * [in] All Maximum key size required.
 	 */
@@ -1126,10 +1122,6 @@ struct tf_alloc_tbl_scope_parms {
 	 * [in] Number of flows * 1000
 	 */
 	uint32_t tx_num_flows_in_k;
-	/**
-	 * [in] SR2 only receive table access interface id
-	 */
-	uint32_t tx_tbl_if_id;
 	/**
 	 * [in] Flush pending HW cached flows every 1/10th of value
 	 * set in seconds, both idle and active flows are flushed
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h b/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
index b2629e47b6..f59da41e54 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2019 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -23,12 +23,10 @@
 #define	BNXT_ULP_DFLT_RX_MAX_ACTN_ENTRY		256
 #define	BNXT_ULP_DFLT_RX_MEM			0
 #define	BNXT_ULP_RX_NUM_FLOWS			32
-#define	BNXT_ULP_RX_TBL_IF_ID			0
 #define	BNXT_ULP_DFLT_TX_MAX_KEY		512
 #define	BNXT_ULP_DFLT_TX_MAX_ACTN_ENTRY		256
 #define	BNXT_ULP_DFLT_TX_MEM			0
 #define	BNXT_ULP_TX_NUM_FLOWS			32
-#define	BNXT_ULP_TX_TBL_IF_ID			0
 
 enum bnxt_tf_rc {
 	BNXT_TF_RC_PARSE_ERR	= -2,
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
index d68cc889c6..141bc0c784 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019-2020 Broadcom
+ * Copyright(c) 2019-2021 Broadcom
  * All rights reserved.
  */
 
@@ -22,6 +22,7 @@
 #include "ulp_flow_db.h"
 #include "ulp_mapper.h"
 #include "ulp_port_db.h"
+#include "ulp_tun.h"
 
 /* Linked list of all TF sessions. */
 STAILQ_HEAD(, bnxt_ulp_session_state) bnxt_ulp_session_list =
@@ -52,8 +53,11 @@ static int32_t
 bnxt_ulp_devid_get(struct bnxt *bp,
 		   enum bnxt_ulp_device_id  *ulp_dev_id)
 {
-	if (BNXT_CHIP_P5(bp))
-		return -EINVAL;
+	if (BNXT_CHIP_P5(bp)) {
+		/* TBD: needs to accommodate even SR2 */
+		*ulp_dev_id = BNXT_ULP_DEVICE_ID_THOR;
+		return 0;
+	}
 
 	if (BNXT_STINGRAY(bp))
 		*ulp_dev_id = BNXT_ULP_DEVICE_ID_STINGRAY;
@@ -70,6 +74,7 @@ bnxt_ulp_tf_session_resources_get(struct bnxt *bp,
 {
 	uint32_t dev_id;
 	int32_t rc;
+	uint16_t *tmp_cnt;
 
 	rc = bnxt_ulp_cntxt_dev_id_get(bp->ulp_ctx, &dev_id);
 	if (rc) {
@@ -113,6 +118,8 @@ bnxt_ulp_tf_session_resources_get(struct bnxt *bp,
 		/* SP */
 		res->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_SP_SMAC] = 255;
 
+		res->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_MIRROR_CONFIG] = 1;
+
 		/** TX **/
 		/* Identifiers */
 		res->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_L2_CTXT_HIGH] = 292;
@@ -148,6 +155,9 @@ bnxt_ulp_tf_session_resources_get(struct bnxt *bp,
 		/* SP */
 		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_SP_SMAC_IPV4] = 488;
 		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_SP_SMAC_IPV6] = 511;
+
+		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_MIRROR_CONFIG] = 1;
+
 		break;
 	case BNXT_ULP_DEVICE_ID_STINGRAY:
 		/** RX **/
@@ -219,6 +229,73 @@ bnxt_ulp_tf_session_resources_get(struct bnxt *bp,
 		/* SP */
 		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_SP_SMAC_IPV4] = 488;
 		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_SP_SMAC_IPV6] = 512;
+		break;
+	case BNXT_ULP_DEVICE_ID_THOR:
+		/** RX **/
+		/* Identifiers */
+		res->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_L2_CTXT_HIGH] = 26;
+		res->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_L2_CTXT_LOW] = 6;
+		res->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_WC_PROF] = 32;
+		res->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_PROF_FUNC] = 32;
+		res->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_EM_PROF] = 32;
+
+		/* Table Types */
+		res->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_FULL_ACT_RECORD] = 1024;
+		res->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_STATS_64] = 512;
+		res->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_MIRROR_CONFIG] = 14;
+		res->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_EM_FKB] = 32;
+		res->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_WC_FKB] = 32;
+
+		/* ENCAP */
+		res->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_ENCAP_64B] = 64;
+
+		/* TCAMs */
+		tmp_cnt = &res->tcam_cnt[TF_DIR_RX].cnt[0];
+		tmp_cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH] = 300;
+		tmp_cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW] = 6;
+		res->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_PROF_TCAM] = 128;
+		res->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_WC_TCAM] = 112;
+
+		/* EM */
+		res->em_cnt[TF_DIR_RX].cnt[TF_EM_TBL_TYPE_EM_RECORD] = 13200;
+
+		/* SP */
+		res->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_SP_SMAC_IPV4] = 64;
+
+		/** TX **/
+		/* Identifiers */
+		res->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_L2_CTXT_HIGH] = 26;
+		res->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_L2_CTXT_LOW] = 26;
+		res->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_WC_PROF] = 32;
+		res->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_PROF_FUNC] = 63;
+		res->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_EM_PROF] = 32;
+
+		/* Table Types */
+		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_FULL_ACT_RECORD] = 1024;
+		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_STATS_64] = 512;
+		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_MIRROR_CONFIG] = 14;
+		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_EM_FKB] = 32;
+		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_WC_FKB] = 32;
+
+		/* ENCAP */
+		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_ENCAP_64B] = 64;
+
+		/* TCAMs */
+		tmp_cnt = &res->tcam_cnt[TF_DIR_TX].cnt[0];
+
+		tmp_cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH] = 200;
+		tmp_cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW] = 110;
+		res->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_PROF_TCAM] = 128;
+		res->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_WC_TCAM] = 128;
+
+		/* EM */
+		res->em_cnt[TF_DIR_TX].cnt[TF_EM_TBL_TYPE_EM_RECORD] = 15232;
+
+		/* SP */
+		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_SP_SMAC_IPV4] = 100;
+
+		res->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_MIRROR_CONFIG] = 1;
+
 		break;
 	default:
 		return -EINVAL;
@@ -273,6 +350,9 @@ ulp_ctx_session_open(struct bnxt *bp,
 	case BNXT_ULP_DEVICE_ID_STINGRAY:
 		params.device_type = TF_DEVICE_TYPE_SR;
 		break;
+	case BNXT_ULP_DEVICE_ID_THOR:
+		params.device_type = TF_DEVICE_TYPE_THOR;
+		break;
 	default:
 		BNXT_TF_DBG(ERR, "Unable to determine device for "
 			    "opening session.\n");
@@ -346,14 +426,12 @@ bnxt_init_tbl_scope_parms(struct bnxt *bp,
 			BNXT_ULP_DFLT_RX_MAX_ACTN_ENTRY;
 		params->rx_mem_size_in_mb = BNXT_ULP_DFLT_RX_MEM;
 		params->rx_num_flows_in_k = BNXT_ULP_RX_NUM_FLOWS;
-		params->rx_tbl_if_id = BNXT_ULP_RX_TBL_IF_ID;
 
 		params->tx_max_key_sz_in_bits = BNXT_ULP_DFLT_TX_MAX_KEY;
 		params->tx_max_action_entry_sz_in_bits =
 			BNXT_ULP_DFLT_TX_MAX_ACTN_ENTRY;
 		params->tx_mem_size_in_mb = BNXT_ULP_DFLT_TX_MEM;
 		params->tx_num_flows_in_k = BNXT_ULP_TX_NUM_FLOWS;
-		params->tx_tbl_if_id = BNXT_ULP_TX_TBL_IF_ID;
 	} else {
 		params->rx_max_key_sz_in_bits = BNXT_ULP_DFLT_RX_MAX_KEY;
 		params->rx_max_action_entry_sz_in_bits =
@@ -361,7 +439,6 @@ bnxt_init_tbl_scope_parms(struct bnxt *bp,
 		params->rx_mem_size_in_mb = BNXT_ULP_DFLT_RX_MEM;
 		params->rx_num_flows_in_k =
 			dparms->ext_flow_db_num_entries / 1024;
-		params->rx_tbl_if_id = BNXT_ULP_RX_TBL_IF_ID;
 
 		params->tx_max_key_sz_in_bits = BNXT_ULP_DFLT_TX_MAX_KEY;
 		params->tx_max_action_entry_sz_in_bits =
@@ -369,7 +446,6 @@ bnxt_init_tbl_scope_parms(struct bnxt *bp,
 		params->tx_mem_size_in_mb = BNXT_ULP_DFLT_TX_MEM;
 		params->tx_num_flows_in_k =
 			dparms->ext_flow_db_num_entries / 1024;
-		params->tx_tbl_if_id = BNXT_ULP_TX_TBL_IF_ID;
 	}
 	BNXT_TF_DBG(INFO, "Table Scope initialized with %uK flows.\n",
 		    params->rx_num_flows_in_k);
@@ -530,6 +606,8 @@ ulp_ctx_init(struct bnxt *bp,
 	if (rc)
 		goto error_deinit;
 
+	ulp_tun_tbl_init(ulp_data->tun_tbl);
+
 	bnxt_ulp_cntxt_tfp_set(bp->ulp_ctx, &bp->tfp);
 	return rc;
 
@@ -827,8 +905,7 @@ bnxt_ulp_destroy_vfr_default_rules(struct bnxt *bp, bool global)
 			continue;
 
 		/* Destroy the flows */
-		ulp_default_flow_destroy(bp->eth_dev, info->rep2vf_flow_id);
-		ulp_default_flow_destroy(bp->eth_dev, info->vf2rep_flow_id);
+		ulp_default_flow_destroy(bp->eth_dev, info->vfr_flow_id);
 		/* Clean up the tx action pointer */
 		vfr_eth_dev = &rte_eth_devices[port_id];
 		if (vfr_eth_dev) {
@@ -1071,7 +1148,11 @@ bnxt_ulp_port_init(struct bnxt *bp)
 		goto jump_to_error;
 	}
 	/* create the default rules */
-	bnxt_ulp_create_df_rules(bp);
+	rc = bnxt_ulp_create_df_rules(bp);
+	if (rc) {
+		BNXT_TF_DBG(ERR, "Failed to create default flow\n");
+		goto jump_to_error;
+	}
 
 	if (BNXT_ACCUM_STATS_EN(bp))
 		bp->ulp_ctx->cfg_data->accum_stats = true;
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
index 47c9c802e2..854eca24c3 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019-2020 Broadcom
+ * Copyright(c) 2019-2021 Broadcom
  * All rights reserved.
  */
 
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <sys/queue.h>
 
+#include "rte_version.h"
 #include "rte_ethdev.h"
 
 #include "ulp_template_db_enum.h"
@@ -38,14 +39,12 @@ enum bnxt_ulp_flow_mem_type {
 };
 
 struct bnxt_ulp_df_rule_info {
-	uint32_t			port_to_app_flow_id;
-	uint32_t			app_to_port_flow_id;
+	uint32_t			def_port_flow_id;
 	uint8_t				valid;
 };
 
 struct bnxt_ulp_vfr_rule_info {
-	uint32_t			rep2vf_flow_id;
-	uint32_t			vf2rep_flow_id;
+	uint32_t			vfr_flow_id;
 	uint16_t			parent_port_id;
 	uint8_t				valid;
 };
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
index 59d75bc496..63fb4b5973 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -70,8 +70,10 @@ bnxt_ulp_set_dir_attributes(struct ulp_rte_parser_params *params,
 		params->dir_attr |= BNXT_ULP_FLOW_ATTR_EGRESS;
 	if (attr->ingress)
 		params->dir_attr |= BNXT_ULP_FLOW_ATTR_INGRESS;
+#if RTE_VERSION_NUM(17, 11, 10, 16) < RTE_VERSION
 	if (attr->transfer)
 		params->dir_attr |= BNXT_ULP_FLOW_ATTR_TRANSFER;
+#endif
 }
 
 void
@@ -79,6 +81,7 @@ bnxt_ulp_init_mapper_params(struct bnxt_ulp_mapper_create_parms *mapper_cparms,
 			    struct ulp_rte_parser_params *params,
 			    enum bnxt_ulp_fdb_type flow_type)
 {
+	memset(mapper_cparms, 0, sizeof(*mapper_cparms));
 	mapper_cparms->flow_type = flow_type;
 	mapper_cparms->app_priority = params->priority;
 	mapper_cparms->dir_attr = params->dir_attr;
@@ -186,6 +189,7 @@ bnxt_ulp_flow_create(struct rte_eth_dev *dev,
 	params.fid = fid;
 	params.func_id = func_id;
 	params.priority = attr->priority;
+	params.port_id = dev->data->port_id;
 	/* Perform the rte flow post process */
 	ret = bnxt_ulp_rte_parser_post_process(&params);
 	if (ret == BNXT_TF_RC_ERROR)
diff --git a/drivers/net/bnxt/tf_ulp/meson.build b/drivers/net/bnxt/tf_ulp/meson.build
index c7ec5a3161..1bb93d4938 100644
--- a/drivers/net/bnxt/tf_ulp/meson.build
+++ b/drivers/net/bnxt/tf_ulp/meson.build
@@ -27,5 +27,5 @@ sources += files(
 	'ulp_rte_handler_tbl.c',
         'ulp_template_db_wh_plus_act.c',
         'ulp_template_db_wh_plus_class.c',
-        'ulp_template_db_stingray_act.c',
-        'ulp_template_db_stingray_class.c')
+	'ulp_template_db_thor_act.c',
+	'ulp_template_db_thor_class.c')
diff --git a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
index ce8bfdc61f..b688288a62 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019-2020 Broadcom
+ * Copyright(c) 2019-2021 Broadcom
  * All rights reserved.
  */
 
@@ -457,9 +457,7 @@ bnxt_ulp_destroy_df_rules(struct bnxt *bp, bool global)
 			return;
 
 		ulp_default_flow_destroy(bp->eth_dev,
-					 info->port_to_app_flow_id);
-		ulp_default_flow_destroy(bp->eth_dev,
-					 info->app_to_port_flow_id);
+					 info->def_port_flow_id);
 		memset(info, 0, sizeof(struct bnxt_ulp_df_rule_info));
 		return;
 	}
@@ -471,9 +469,7 @@ bnxt_ulp_destroy_df_rules(struct bnxt *bp, bool global)
 			continue;
 
 		ulp_default_flow_destroy(bp->eth_dev,
-					 info->port_to_app_flow_id);
-		ulp_default_flow_destroy(bp->eth_dev,
-					 info->app_to_port_flow_id);
+					 info->def_port_flow_id);
 		memset(info, 0, sizeof(struct bnxt_ulp_df_rule_info));
 	}
 }
@@ -496,6 +492,10 @@ bnxt_create_port_app_df_rule(struct bnxt *bp, uint8_t flow_type,
 		}
 	};
 
+	if (!flow_type) {
+		*flow_id = 0;
+		return 0;
+	}
 	return ulp_default_flow_create(bp->eth_dev, param_list, flow_type,
 				       flow_id);
 }
@@ -505,7 +505,7 @@ bnxt_ulp_create_df_rules(struct bnxt *bp)
 {
 	struct bnxt_ulp_df_rule_info *info;
 	uint8_t port_id;
-	int rc;
+	int rc = 0;
 
 	if (!BNXT_TRUFLOW_EN(bp) ||
 	    BNXT_ETH_DEV_IS_REPRESENTOR(bp->eth_dev) || !bp->ulp_ctx)
@@ -513,39 +513,22 @@ bnxt_ulp_create_df_rules(struct bnxt *bp)
 
 	port_id = bp->eth_dev->data->port_id;
 	info = &bp->ulp_ctx->cfg_data->df_rule_info[port_id];
-	rc = bnxt_create_port_app_df_rule(bp, BNXT_ULP_DF_TPL_PORT_TO_VS,
-					  &info->port_to_app_flow_id);
+	rc = bnxt_create_port_app_df_rule(bp,
+					  BNXT_ULP_DF_TPL_DEFAULT_UPLINK_PORT,
+					  &info->def_port_flow_id);
 	if (rc) {
 		BNXT_TF_DBG(ERR,
 			    "Failed to create port to app default rule\n");
 		return rc;
 	}
 
-	bp->tx_cfa_action = 0;
-	rc = bnxt_create_port_app_df_rule(bp, BNXT_ULP_DF_TPL_VS_TO_PORT,
-					  &info->app_to_port_flow_id);
-	if (rc) {
-		BNXT_TF_DBG(ERR,
-			    "Failed to create app to port default rule\n");
-		goto port_to_app_free;
-	}
-
 	rc = ulp_default_flow_db_cfa_action_get(bp->ulp_ctx,
-						info->app_to_port_flow_id,
+						info->def_port_flow_id,
 						&bp->tx_cfa_action);
 	if (rc)
-		goto app_to_port_free;
-
+		bp->tx_cfa_action = 0;
 	info->valid = true;
 	return 0;
-
-app_to_port_free:
-	ulp_default_flow_destroy(bp->eth_dev, info->app_to_port_flow_id);
-port_to_app_free:
-	ulp_default_flow_destroy(bp->eth_dev, info->port_to_app_flow_id);
-	info->valid = false;
-
-	return rc;
 }
 
 static int32_t
@@ -598,22 +581,15 @@ bnxt_ulp_create_vfr_default_rules(struct rte_eth_dev *vfr_ethdev)
 	}
 
 	memset(info, 0, sizeof(struct bnxt_ulp_vfr_rule_info));
-	rc = bnxt_create_port_vfr_default_rule(bp, BNXT_ULP_DF_TPL_VFREP_TO_VF,
-					       vfr_port_id,
-					       &info->rep2vf_flow_id);
-	if (rc) {
-		BNXT_TF_DBG(ERR, "Failed to create VFREP to VF default rule\n");
-		goto error;
-	}
-	rc = bnxt_create_port_vfr_default_rule(bp, BNXT_ULP_DF_TPL_VF_TO_VFREP,
+	rc = bnxt_create_port_vfr_default_rule(bp, BNXT_ULP_DF_TPL_DEFAULT_VFR,
 					       vfr_port_id,
-					       &info->vf2rep_flow_id);
+					       &info->vfr_flow_id);
 	if (rc) {
-		BNXT_TF_DBG(ERR, "Failed to create VF to VFREP default rule\n");
+		BNXT_TF_DBG(ERR, "Failed to create VFR default rule\n");
 		goto error;
 	}
 	rc = ulp_default_flow_db_cfa_action_get(bp->ulp_ctx,
-						info->rep2vf_flow_id,
+						info->vfr_flow_id,
 						&vfr->vfr_tx_cfa_action);
 	if (rc) {
 		BNXT_TF_DBG(ERR, "Failed to get the tx cfa action\n");
@@ -626,10 +602,8 @@ bnxt_ulp_create_vfr_default_rules(struct rte_eth_dev *vfr_ethdev)
 	return 0;
 
 error:
-	if (info->rep2vf_flow_id)
-		ulp_default_flow_destroy(bp->eth_dev, info->rep2vf_flow_id);
-	if (info->vf2rep_flow_id)
-		ulp_default_flow_destroy(bp->eth_dev, info->vf2rep_flow_id);
+	if (info->vfr_flow_id)
+		ulp_default_flow_destroy(bp->eth_dev, info->vfr_flow_id);
 	return rc;
 }
 
@@ -653,8 +627,7 @@ bnxt_ulp_delete_vfr_default_rules(struct bnxt_representor *vfr)
 		BNXT_TF_DBG(ERR, "VFR already freed\n");
 		return -EINVAL;
 	}
-	ulp_default_flow_destroy(bp->eth_dev, info->rep2vf_flow_id);
-	ulp_default_flow_destroy(bp->eth_dev, info->vf2rep_flow_id);
+	ulp_default_flow_destroy(bp->eth_dev, info->vfr_flow_id);
 	vfr->vfr_tx_cfa_action = 0;
 	memset(info, 0, sizeof(struct bnxt_ulp_vfr_rule_info));
 	return 0;
diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
index 65029139e6..a25893c63c 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
@@ -80,6 +80,12 @@ ulp_fc_mgr_init(struct bnxt_ulp_context *ctxt)
 		return -EINVAL;
 	}
 
+	if (!dparms->flow_count_db_entries) {
+		BNXT_TF_DBG(DEBUG, "flow counter support is not enabled\n");
+		bnxt_ulp_cntxt_ptr2_fc_info_set(ctxt, NULL);
+		return 0;
+	}
+
 	ulp_fc_info = rte_zmalloc("ulp_fc_info", sizeof(*ulp_fc_info), 0);
 	if (!ulp_fc_info)
 		goto error;
@@ -169,7 +175,10 @@ bool ulp_fc_mgr_thread_isstarted(struct bnxt_ulp_context *ctxt)
 
 	ulp_fc_info = bnxt_ulp_cntxt_ptr2_fc_info_get(ctxt);
 
-	return !!(ulp_fc_info->flags & ULP_FLAG_FC_THREAD);
+	if (ulp_fc_info)
+		return !!(ulp_fc_info->flags & ULP_FLAG_FC_THREAD);
+
+	return false;
 }
 
 /*
@@ -186,7 +195,7 @@ ulp_fc_mgr_thread_start(struct bnxt_ulp_context *ctxt)
 
 	ulp_fc_info = bnxt_ulp_cntxt_ptr2_fc_info_get(ctxt);
 
-	if (!(ulp_fc_info->flags & ULP_FLAG_FC_THREAD)) {
+	if (ulp_fc_info && !(ulp_fc_info->flags & ULP_FLAG_FC_THREAD)) {
 		rte_eal_alarm_set(US_PER_S * ULP_FC_TIMER,
 				  ulp_fc_mgr_alarm_cb,
 				  (void *)ctxt);
@@ -459,7 +468,10 @@ bool ulp_fc_mgr_start_idx_isset(struct bnxt_ulp_context *ctxt, enum tf_dir dir)
 
 	ulp_fc_info = bnxt_ulp_cntxt_ptr2_fc_info_get(ctxt);
 
-	return ulp_fc_info->shadow_hw_tbl[dir].start_idx_is_set;
+	if (ulp_fc_info)
+		return ulp_fc_info->shadow_hw_tbl[dir].start_idx_is_set;
+
+	return false;
 }
 
 /*
diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h
index de4d3dfe95..04cb86bea2 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2019 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
index 47c8c48456..8a6a925559 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
@@ -522,7 +522,9 @@ ulp_flow_db_init(struct bnxt_ulp_context *ulp_ctxt)
 	bnxt_ulp_cntxt_ptr2_flow_db_set(ulp_ctxt, flow_db);
 
 	/* Determine the number of flows based on EM type */
-	bnxt_ulp_cntxt_mem_type_get(ulp_ctxt, &mtype);
+	if (bnxt_ulp_cntxt_mem_type_get(ulp_ctxt, &mtype))
+		goto error_free;
+
 	if (mtype == BNXT_ULP_FLOW_MEM_TYPE_INT)
 		num_flows = dparms->int_flow_db_num_entries;
 	else
@@ -676,6 +678,7 @@ ulp_flow_db_resource_add(struct bnxt_ulp_context *ulp_ctxt,
 	struct bnxt_ulp_flow_db *flow_db;
 	struct bnxt_ulp_flow_tbl *flow_tbl;
 	struct ulp_fdb_resource_info *resource, *fid_resource;
+	struct bnxt_ulp_fc_info *ulp_fc_info;
 	uint32_t idx;
 
 	flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
@@ -728,9 +731,11 @@ ulp_flow_db_resource_add(struct bnxt_ulp_context *ulp_ctxt,
 		ulp_flow_db_res_params_to_info(fid_resource, params);
 	}
 
+	ulp_fc_info = bnxt_ulp_cntxt_ptr2_fc_info_get(ulp_ctxt);
 	if (params->resource_type == TF_TBL_TYPE_ACT_STATS_64 &&
 	    params->resource_sub_type ==
-	    BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) {
+	    BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT &&
+	    ulp_fc_info) {
 		/* Store the first HW counter ID for this table */
 		if (!ulp_fc_mgr_start_idx_isset(ulp_ctxt, params->direction))
 			ulp_fc_mgr_start_idx_set(ulp_ctxt, params->direction,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c
index 0b91520930..5c94e2f5d0 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -246,8 +246,28 @@ ulp_mapper_gen_tbl_entry_data_get(struct ulp_mapper_gen_tbl_entry *entry,
 	return 0;
 }
 
-/*
- * Free the generic table list entry
+/* Free the generic table list entry
+ *
+ * ulp_ctx [in] - Pointer to the ulp context
+ * tbl_idx [in] - Index of the generic table
+ * ckey [in] - Key for the entry in the table
+ *
+ * returns 0 on success
+ */
+int32_t
+ulp_mapper_gen_tbl_entry_free(struct bnxt_ulp_context *ulp_ctx,
+			      uint32_t tbl_idx, uint32_t ckey)
+{
+	struct ulp_flow_db_res_params res;
+
+	res.direction = tbl_idx & 0x1;
+	res.resource_sub_type = tbl_idx >> 1;
+	res.resource_hndl = ckey;
+
+	return ulp_mapper_gen_tbl_res_free(ulp_ctx, &res);
+}
+
+/* Free the generic table list resource
  *
  * ulp_ctx [in] - Pointer to the ulp context
  * res [in] - Pointer to flow db resource entry
diff --git a/drivers/net/bnxt/tf_ulp/ulp_gen_tbl.h b/drivers/net/bnxt/tf_ulp/ulp_gen_tbl.h
index 7f4a877e9a..f245825142 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_gen_tbl.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_gen_tbl.h
@@ -131,7 +131,7 @@ ulp_mapper_gen_tbl_entry_data_get(struct ulp_mapper_gen_tbl_entry *entry,
 				  uint32_t data_size);
 
 /*
- * Free the generic table list entry
+ * Free the generic table list resource
  *
  * ulp_ctx [in] - Pointer to the ulp context
  * res [in] - Pointer to flow db resource entry
@@ -142,6 +142,18 @@ int32_t
 ulp_mapper_gen_tbl_res_free(struct bnxt_ulp_context *ulp_ctx,
 			    struct ulp_flow_db_res_params *res);
 
+/* Free the generic table list entry
+ *
+ * ulp_ctx [in] - Pointer to the ulp context
+ * tbl_idx [in] - Index of the generic table
+ * ckey [in] - Key for the entry in the table
+ *
+ * returns 0 on success
+ */
+int32_t
+ulp_mapper_gen_tbl_entry_free(struct bnxt_ulp_context *ulp_ctx,
+			      uint32_t tbl_idx, uint32_t ckey);
+
 /*
  * Write the generic table list hash entry
  *
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 996b80ebbf..90ba38d05b 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -133,7 +133,7 @@ ulp_mapper_resource_ident_allocate(struct bnxt_ulp_context *ulp_ctx,
 	rc = ulp_mapper_glb_resource_write(mapper_data, glb_res, regval);
 	if (rc) {
 		BNXT_TF_DBG(ERR, "Failed to write to global resource id\n");
-		/* Free the identifer when update failed */
+		/* Free the identifier when update failed */
 		fparms.dir = iparms.dir;
 		fparms.ident_type = iparms.ident_type;
 		fparms.id = iparms.id;
@@ -190,7 +190,7 @@ ulp_mapper_resource_index_tbl_alloc(struct bnxt_ulp_context *ulp_ctx,
 	rc = ulp_mapper_glb_resource_write(mapper_data, glb_res, regval);
 	if (rc) {
 		BNXT_TF_DBG(ERR, "Failed to write to global resource id\n");
-		/* Free the identifer when update failed */
+		/* Free the identifier when update failed */
 		free_parms.dir = aparms.dir;
 		free_parms.type = aparms.type;
 		free_parms.idx = aparms.idx;
@@ -200,16 +200,6 @@ ulp_mapper_resource_index_tbl_alloc(struct bnxt_ulp_context *ulp_ctx,
 	return rc;
 }
 
-/* Retrieve the global template table */
-static uint32_t *
-ulp_mapper_glb_template_table_get(uint32_t *num_entries)
-{
-	if (!num_entries)
-		return NULL;
-	*num_entries = BNXT_ULP_GLB_TEMPLATE_TBL_MAX_SZ;
-	return ulp_glb_template_tbl;
-}
-
 static int32_t
 ulp_mapper_glb_field_tbl_get(struct bnxt_ulp_mapper_parms *parms,
 			     uint32_t operand,
@@ -896,6 +886,20 @@ ulp_mapper_field_port_db_process(struct bnxt_ulp_mapper_parms *parms,
 			return -EINVAL;
 		}
 		break;
+	case BNXT_ULP_PORT_TABLE_DRV_FUNC_MAC:
+		if (ulp_port_db_drv_mac_addr_get(parms->ulp_ctx, port_id,
+						 val)) {
+			BNXT_TF_DBG(ERR, "Invalid port id %u\n", port_id);
+			return -EINVAL;
+		}
+		break;
+	case BNXT_ULP_PORT_TABLE_DRV_FUNC_PARENT_VNIC:
+		if (ulp_port_db_parent_vnic_get(parms->ulp_ctx, port_id,
+						val)) {
+			BNXT_TF_DBG(ERR, "Invalid port id %u\n", port_id);
+			return -EINVAL;
+		}
+		break;
 	default:
 		BNXT_TF_DBG(ERR, "Invalid port_data %s\n", fld->description);
 		return -EINVAL;
@@ -1676,18 +1680,11 @@ ulp_mapper_tcam_tbl_entry_write(struct bnxt_ulp_mapper_parms *parms,
 	sparms.dir		= tbl->direction;
 	sparms.tcam_tbl_type	= tbl->resource_type;
 	sparms.idx		= idx;
-	/* Already verified the key/mask lengths */
 	sparms.key		= ulp_blob_data_get(key, &tmplen);
+	sparms.key_sz_in_bits	= tmplen;
 	sparms.mask		= ulp_blob_data_get(mask, &tmplen);
-	sparms.key_sz_in_bits	= tbl->key_bit_size;
 	sparms.result		= ulp_blob_data_get(data, &tmplen);
-
-	if (tbl->result_bit_size != tmplen) {
-		BNXT_TF_DBG(ERR, "Result len (%d) != Expected (%d)\n",
-			    tmplen, tbl->result_bit_size);
-		return -EINVAL;
-	}
-	sparms.result_sz_in_bits = tbl->result_bit_size;
+	sparms.result_sz_in_bits = tmplen;
 	if (tf_set_tcam_entry(tfp, &sparms)) {
 		BNXT_TF_DBG(ERR, "tcam[%s][%s][%x] write failed.\n",
 			    tf_tcam_tbl_2_str(sparms.tcam_tbl_type),
@@ -1705,6 +1702,103 @@ ulp_mapper_tcam_tbl_entry_write(struct bnxt_ulp_mapper_parms *parms,
 	return rc;
 }
 
+/*
+ * internal function to post process key/mask blobs for dynamic pad WC tcam tbl
+ *
+ * parms [in] The mappers parms with data related to the flow.
+ *
+ * key [in] The original key to be transformed
+ *
+ * mask [in] The original mask to be transformed
+ *
+ * tkey [in/out] The transformed key
+ *
+ * tmask [in/out] The transformed mask
+ *
+ * returns zero on success, non-zero on failure
+ */
+static uint32_t
+ulp_mapper_wc_tcam_tbl_dyn_post_process(struct bnxt_ulp_device_params *dparms,
+					struct ulp_blob *key,
+					struct ulp_blob *mask,
+					struct ulp_blob *tkey,
+					struct ulp_blob *tmask)
+{
+	uint16_t tlen, blen, clen, slice_width, num_slices, max_slices, offset;
+	uint32_t cword, i, rc;
+	int32_t pad;
+	uint8_t *val;
+
+	slice_width = dparms->wc_slice_width;
+	clen = dparms->wc_ctl_size_bits;
+	max_slices = dparms->wc_max_slices;
+	blen = ulp_blob_data_len_get(key);
+
+	/* Get the length of the key based on number of slices and width */
+	num_slices = 1;
+	tlen = slice_width;
+	while (tlen < blen &&
+	       num_slices <= max_slices) {
+		num_slices = num_slices << 1;
+		tlen = tlen << 1;
+	}
+
+	if (num_slices > max_slices) {
+		BNXT_TF_DBG(ERR, "Key size (%d) too large for WC\n", blen);
+		return -EINVAL;
+	}
+
+	/* The key/mask may not be on a natural slice boundary, pad it */
+	pad = tlen - blen;
+	if (ulp_blob_pad_push(key, pad) < 0 ||
+	    ulp_blob_pad_push(mask, pad) < 0) {
+		BNXT_TF_DBG(ERR, "Unable to pad key/mask\n");
+		return -EINVAL;
+	}
+
+	/* The new length accounts for the ctrl word length and num slices */
+	tlen = tlen + clen * num_slices;
+	if (!ulp_blob_init(tkey, tlen, key->byte_order) ||
+	    !ulp_blob_init(tmask, tlen, mask->byte_order)) {
+		BNXT_TF_DBG(ERR, "Unable to post process wc tcam entry\n");
+		return -EINVAL;
+	}
+
+	/* Build the transformed key/mask */
+	cword = dparms->wc_mode_list[num_slices - 1];
+	cword = tfp_cpu_to_be_32(cword);
+	offset = 0;
+	for (i = 0; i < num_slices; i++) {
+		val = ulp_blob_push_32(tkey, &cword, clen);
+		if (!val) {
+			BNXT_TF_DBG(ERR, "Key ctrl word push failed\n");
+			return -EINVAL;
+		}
+		val = ulp_blob_push_32(tmask, &cword, clen);
+		if (!val) {
+			BNXT_TF_DBG(ERR, "Mask ctrl word push failed\n");
+			return -EINVAL;
+		}
+		rc = ulp_blob_append(tkey, key, offset, slice_width);
+		if (rc) {
+			BNXT_TF_DBG(ERR, "Key blob append failed\n");
+			return rc;
+		}
+		rc = ulp_blob_append(tmask, mask, offset, slice_width);
+		if (rc) {
+			BNXT_TF_DBG(ERR, "Mask blob append failed\n");
+			return rc;
+		}
+		offset += slice_width;
+	}
+
+	/* The key/mask are byte reversed on every 4 byte chunk */
+	ulp_blob_perform_byte_reverse(tkey, 4);
+	ulp_blob_perform_byte_reverse(tmask, 4);
+
+	return 0;
+}
+
 /* internal function to post process the key/mask blobs for wildcard tcam tbl */
 static void ulp_mapper_wc_tcam_tbl_post_process(struct ulp_blob *blob)
 {
@@ -1717,10 +1811,13 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 			    struct bnxt_ulp_mapper_tbl_info *tbl)
 {
 	struct bnxt_ulp_mapper_key_info	*kflds;
-	struct ulp_blob key, mask, data, update_data;
+	struct ulp_blob okey, omask, data, update_data;
+	struct ulp_blob tkey, tmask; /* transform key and mask */
+	struct ulp_blob *key, *mask;
 	uint32_t i, num_kflds;
 	struct tf *tfp;
 	int32_t rc, trc;
+	struct bnxt_ulp_device_params *dparms = parms->device_params;
 	struct tf_alloc_tcam_entry_parms aparms		= { 0 };
 	struct tf_search_tcam_entry_parms searchparms   = { 0 };
 	struct ulp_flow_db_res_params	fid_parms	= { 0 };
@@ -1729,6 +1826,10 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 	uint16_t tmplen = 0;
 	uint16_t idx;
 
+	/* Set the key and mask to the original key and mask. */
+	key = &okey;
+	mask = &omask;
+
 	/* Skip this if table opcode is NOP */
 	if (tbl->tbl_opcode == BNXT_ULP_TCAM_TBL_OPC_NOT_USED ||
 	    tbl->tbl_opcode >= BNXT_ULP_TCAM_TBL_OPC_LAST) {
@@ -1749,23 +1850,15 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		return -EINVAL;
 	}
 
-	if (!ulp_blob_init(&key, tbl->blob_key_bit_size,
-			   parms->device_params->byte_order) ||
-	    !ulp_blob_init(&mask, tbl->blob_key_bit_size,
-			   parms->device_params->byte_order) ||
-	    !ulp_blob_init(&data, tbl->result_bit_size,
-			   parms->device_params->byte_order) ||
+	if (!ulp_blob_init(key, tbl->blob_key_bit_size, tbl->byte_order) ||
+	    !ulp_blob_init(mask, tbl->blob_key_bit_size, tbl->byte_order) ||
+	    !ulp_blob_init(&data, tbl->result_bit_size, dparms->byte_order) ||
 	    !ulp_blob_init(&update_data, tbl->result_bit_size,
-			   parms->device_params->byte_order)) {
+			   dparms->byte_order)) {
 		BNXT_TF_DBG(ERR, "blob inits failed.\n");
 		return -EINVAL;
 	}
 
-	if (tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM) {
-		key.byte_order = BNXT_ULP_BYTE_ORDER_BE;
-		mask.byte_order = BNXT_ULP_BYTE_ORDER_BE;
-	}
-
 	/* create the key/mask */
 	/*
 	 * NOTE: The WC table will require some kind of flag to handle the
@@ -1775,7 +1868,7 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		/* Setup the key */
 		rc = ulp_mapper_field_process(parms, tbl->direction,
 					      &kflds[i].field_info_spec,
-					      &key, 1, "TCAM Key");
+					      key, 1, "TCAM Key");
 		if (rc) {
 			BNXT_TF_DBG(ERR, "Key field set failed %s\n",
 				    kflds[i].field_info_spec.description);
@@ -1785,7 +1878,7 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		/* Setup the mask */
 		rc = ulp_mapper_field_process(parms, tbl->direction,
 					      &kflds[i].field_info_mask,
-					      &mask, 0, "TCAM Mask");
+					      mask, 0, "TCAM Mask");
 		if (rc) {
 			BNXT_TF_DBG(ERR, "Mask field set failed %s\n",
 				    kflds[i].field_info_mask.description);
@@ -1795,28 +1888,34 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 
 	/* For wild card tcam perform the post process to swap the blob */
 	if (tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM) {
-		ulp_mapper_wc_tcam_tbl_post_process(&key);
-		ulp_mapper_wc_tcam_tbl_post_process(&mask);
+		if (dparms->dynamic_pad_en) {
+			/* Sets up the slices for writing to the WC TCAM */
+			rc = ulp_mapper_wc_tcam_tbl_dyn_post_process(dparms,
+								     key, mask,
+								     &tkey,
+								     &tmask);
+			if (rc) {
+				BNXT_TF_DBG(ERR,
+					    "Failed to post proc WC entry.\n");
+				return rc;
+			}
+			/* Now need to use the transform Key/Mask */
+			key = &tkey;
+			mask = &tmask;
+		} else {
+			ulp_mapper_wc_tcam_tbl_post_process(key);
+			ulp_mapper_wc_tcam_tbl_post_process(mask);
+		}
+
 	}
 
 	if (tbl->tbl_opcode == BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE) {
 		/* allocate the tcam index */
 		aparms.dir = tbl->direction;
 		aparms.tcam_tbl_type = tbl->resource_type;
-		aparms.key = ulp_blob_data_get(&key, &tmplen);
+		aparms.key = ulp_blob_data_get(key, &tmplen);
 		aparms.key_sz_in_bits = tmplen;
-		if (tbl->blob_key_bit_size != tmplen) {
-			BNXT_TF_DBG(ERR, "Key len (%d) != Expected (%d)\n",
-				    tmplen, tbl->blob_key_bit_size);
-			return -EINVAL;
-		}
-
-		aparms.mask = ulp_blob_data_get(&mask, &tmplen);
-		if (tbl->blob_key_bit_size != tmplen) {
-			BNXT_TF_DBG(ERR, "Mask len (%d) != Expected (%d)\n",
-				    tmplen, tbl->blob_key_bit_size);
-			return -EINVAL;
-		}
+		aparms.mask = ulp_blob_data_get(mask, &tmplen);
 
 		/* calculate the entry priority */
 		rc = ulp_mapper_priority_opc_process(parms, tbl,
@@ -1840,9 +1939,9 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		 */
 		searchparms.dir = tbl->direction;
 		searchparms.tcam_tbl_type = tbl->resource_type;
-		searchparms.key = ulp_blob_data_get(&key, &tmplen);
+		searchparms.key = ulp_blob_data_get(key, &tmplen);
 		searchparms.key_sz_in_bits = tbl->key_bit_size;
-		searchparms.mask = ulp_blob_data_get(&mask, &tmplen);
+		searchparms.mask = ulp_blob_data_get(mask, &tmplen);
 		searchparms.alloc = 1;
 		searchparms.result = ulp_blob_data_get(&data, &tmplen);
 		searchparms.result_sz_in_bits = tbl->result_bit_size;
@@ -1890,8 +1989,8 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 							 "TCAM Result");
 		/* write the tcam entry */
 		if (!rc)
-			rc = ulp_mapper_tcam_tbl_entry_write(parms, tbl, &key,
-							     &mask, &data, idx);
+			rc = ulp_mapper_tcam_tbl_entry_write(parms, tbl, key,
+							     mask, &data, idx);
 	} else {
 		/*Scan identifier list, extract identifier and update regfile*/
 		rc = ulp_mapper_tcam_tbl_scan_ident_extract(parms, tbl, &data);
@@ -1938,8 +2037,10 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 	struct tf_insert_em_entry_parms iparms = { 0 };
 	struct tf_delete_em_entry_parms free_parms = { 0 };
 	enum bnxt_ulp_flow_mem_type mtype;
+	struct bnxt_ulp_device_params *dparms = parms->device_params;
 	int32_t	trc;
 	int32_t rc = 0;
+	int32_t pad = 0;
 
 	rc = bnxt_ulp_cntxt_mem_type_get(parms->ulp_ctx, &mtype);
 	if (rc) {
@@ -1955,9 +2056,9 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 
 	/* Initialize the key/result blobs */
 	if (!ulp_blob_init(&key, tbl->blob_key_bit_size,
-			   parms->device_params->byte_order) ||
+			   tbl->byte_order) ||
 	    !ulp_blob_init(&data, tbl->result_bit_size,
-			   parms->device_params->byte_order)) {
+			   tbl->byte_order)) {
 		BNXT_TF_DBG(ERR, "blob inits failed.\n");
 		return -EINVAL;
 	}
@@ -1974,10 +2075,19 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		}
 	}
 
-	/*
-	 * TBD: Normally should process identifiers in case of using recycle or
-	 * loopback.  Not supporting recycle for now.
-	 */
+	/* if dynamic padding is enabled then add padding to result data */
+	if (dparms->dynamic_pad_en) {
+		/* add padding to make sure key is at byte boundary */
+		ulp_blob_pad_align(&key, ULP_BUFFER_ALIGN_8_BITS);
+
+		/* add the pad */
+		pad = dparms->em_blk_align_bits - dparms->em_blk_size_bits;
+		if (pad < 0) {
+			BNXT_TF_DBG(ERR, "Invalid em blk size and align\n");
+			return -EINVAL;
+		}
+		ulp_blob_pad_push(&data, (uint32_t)pad);
+	}
 
 	/* Create the result data blob */
 	rc = ulp_mapper_tbl_result_build(parms, tbl, &data, "EM Result");
@@ -1985,9 +2095,33 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		BNXT_TF_DBG(ERR, "Failed to build the result blob\n");
 		return rc;
 	}
+	if (dparms->dynamic_pad_en) {
+		uint32_t abits = dparms->em_blk_align_bits;
+
+		/* when dynamic padding is enabled merge result + key */
+		rc = ulp_blob_block_merge(&data, &key, abits, pad);
+		if (rc) {
+			BNXT_TF_DBG(ERR, "Failed to merge the result blob\n");
+			return rc;
+		}
+
+		/* add padding to make sure merged result is at slice boundary*/
+		ulp_blob_pad_align(&data, abits);
+
+		ulp_blob_perform_byte_reverse(&data, ULP_BITS_2_BYTE(abits));
+	}
+
 	/* do the transpose for the internal EM keys */
-	if (tbl->resource_type == TF_MEM_INTERNAL)
-		ulp_blob_perform_byte_reverse(&key);
+	if (tbl->resource_type == TF_MEM_INTERNAL) {
+		if (dparms->em_key_align_bytes) {
+			int32_t b = ULP_BYTE_2_BITS(dparms->em_key_align_bytes);
+
+			tmplen = ulp_blob_data_len_get(&key);
+			ulp_blob_pad_push(&key, b - tmplen);
+		}
+		tmplen = ulp_blob_data_len_get(&key);
+		ulp_blob_perform_byte_reverse(&key, ULP_BITS_2_BYTE(tmplen));
+	}
 
 	rc = bnxt_ulp_cntxt_tbl_scope_id_get(parms->ulp_ctx,
 					     &iparms.tbl_scope_id);
@@ -2006,7 +2140,10 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 	iparms.key			= ulp_blob_data_get(&key, &tmplen);
 	iparms.key_sz_in_bits		= tbl->key_bit_size;
 	iparms.em_record		= ulp_blob_data_get(&data, &tmplen);
-	iparms.em_record_sz_in_bits	= tbl->result_bit_size;
+	if (tbl->result_bit_size)
+		iparms.em_record_sz_in_bits	= tbl->result_bit_size;
+	else
+		iparms.em_record_sz_in_bits	= tmplen;
 
 	rc = tf_insert_em_entry(tfp, &iparms);
 	if (rc) {
@@ -2064,19 +2201,19 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 	struct ulp_blob	data;
 	uint64_t regval = 0;
 	uint16_t tmplen;
-	uint32_t index, hit;
+	uint32_t index;
 	int32_t rc = 0, trc = 0;
 	struct tf_alloc_tbl_entry_parms aparms = { 0 };
-	struct tf_search_tbl_entry_parms srchparms = { 0 };
 	struct tf_set_tbl_entry_parms sparms = { 0 };
 	struct tf_get_tbl_entry_parms gparms = { 0 };
 	struct tf_free_tbl_entry_parms free_parms = { 0 };
 	uint32_t tbl_scope_id;
 	struct tf *tfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx);
+	struct bnxt_ulp_glb_resource_info glb_res;
 	uint16_t bit_size;
 	bool alloc = false;
 	bool write = false;
-	bool search = false;
+	bool global = false;
 	uint64_t act_rec_size;
 
 	/* use the max size if encap is enabled */
@@ -2111,21 +2248,6 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		alloc = true;
 		write = true;
 		break;
-	case BNXT_ULP_INDEX_TBL_OPC_SRCH_ALLOC_WR_REGFILE:
-		if (tbl->resource_type == TF_TBL_TYPE_EXT) {
-			/* Not currently supporting with EXT */
-			BNXT_TF_DBG(ERR,
-				    "Ext Table Search Opcode not supported.\n");
-			return -EINVAL;
-		}
-		/*
-		 * Search for the entry in the tf core.  If it is hit, save the
-		 * index in the regfile.  If it is a miss, Build the entry,
-		 * alloc an index, write the table, and store the data in the
-		 * regfile (same as ALLOC_WR).
-		 */
-		search = true;
-		break;
 	case BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE:
 		/*
 		 * get the index to write to from the regfile and then write
@@ -2146,6 +2268,19 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 
 		write = true;
 		break;
+	case BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_GLB_REGFILE:
+		/*
+		 * Build the entry, alloc an index, write the table, and store
+		 * the data in the global regfile.
+		 */
+		alloc = true;
+		global = true;
+		write = true;
+		glb_res.direction = tbl->direction;
+		glb_res.resource_func = tbl->resource_func;
+		glb_res.resource_type = tbl->resource_type;
+		glb_res.glb_regfile_index = tbl->tbl_operand;
+		break;
 	case BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE:
 		if (tbl->fdb_opcode != BNXT_ULP_FDB_OPC_NOP) {
 			BNXT_TF_DBG(ERR, "Template error, wrong fdb opcode\n");
@@ -2222,7 +2357,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		return -EINVAL;
 	}
 
-	if (write || search) {
+	if (write) {
 		/* Get the result fields list */
 		rc = ulp_mapper_tbl_result_build(parms,
 						 tbl,
@@ -2234,36 +2369,6 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		}
 	}
 
-	if (search) {
-		/* Use the result blob to perform a search */
-		memset(&srchparms, 0, sizeof(srchparms));
-		srchparms.dir = tbl->direction;
-		srchparms.type = tbl->resource_type;
-		srchparms.alloc	= 1;
-		srchparms.result = ulp_blob_data_get(&data, &tmplen);
-		srchparms.result_sz_in_bytes = ULP_BITS_2_BYTE(tmplen);
-		srchparms.tbl_scope_id = tbl_scope_id;
-		rc = tf_search_tbl_entry(tfp, &srchparms);
-		if (rc) {
-			BNXT_TF_DBG(ERR, "Alloc table[%s][%s] failed rc=%d\n",
-				    tf_tbl_type_2_str(tbl->resource_type),
-				    tf_dir_2_str(tbl->direction), rc);
-			return rc;
-		}
-		if (srchparms.search_status == REJECT) {
-			BNXT_TF_DBG(ERR, "Alloc table[%s][%s] rejected.\n",
-				    tf_tbl_type_2_str(tbl->resource_type),
-				    tf_dir_2_str(tbl->direction));
-			return -ENOMEM;
-		}
-		index = srchparms.idx;
-		hit = srchparms.hit;
-		if (hit)
-			write = false;
-		else
-			write = true;
-	}
-
 	if (alloc) {
 		aparms.dir		= tbl->direction;
 		aparms.type		= tbl->resource_type;
@@ -2278,9 +2383,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 			return rc;
 		}
 		index = aparms.idx;
-	}
 
-	if (search || alloc) {
 		/*
 		 * Store the index in the regfile since we either allocated it
 		 * or it was a hit.
@@ -2294,12 +2397,19 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 			regval = TF_ACT_REC_OFFSET_2_PTR(index);
 		else
 			regval = index;
+		regval = tfp_cpu_to_be_64(regval);
 
-		rc = ulp_regfile_write(parms->regfile,
-				       tbl->tbl_operand,
-				       tfp_cpu_to_be_64(regval));
+		if (global) {
+			rc = ulp_mapper_glb_resource_write(parms->mapper_data,
+							   &glb_res, regval);
+		} else {
+			rc = ulp_regfile_write(parms->regfile,
+					       tbl->tbl_operand, regval);
+		}
 		if (rc) {
-			BNXT_TF_DBG(ERR, "Failed to write regfile[%d] rc=%d\n",
+			BNXT_TF_DBG(ERR,
+				    "Failed to write %s regfile[%d] rc=%d\n",
+				    (global) ? "global" : "reg",
 				    tbl->tbl_operand, rc);
 			goto error;
 		}
@@ -2476,7 +2586,7 @@ ulp_mapper_if_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 
 	/*
 	 * TBD: Need to look at the need to store idx in flow db for restore
-	 * the table to its orginial state on deletion of this entry.
+	 * the table to its original state on deletion of this entry.
 	 */
 	return rc;
 }
@@ -3312,62 +3422,6 @@ ulp_mapper_flow_destroy(struct bnxt_ulp_context *ulp_ctx,
 	return rc;
 }
 
-/* Function to handle the default global templates that are allocated during
- * the startup and reused later.
- */
-static int32_t
-ulp_mapper_glb_template_table_init(struct bnxt_ulp_context *ulp_ctx)
-{
-	uint32_t *glbl_tmpl_list;
-	uint32_t num_glb_tmpls, idx, dev_id;
-	struct bnxt_ulp_mapper_parms parms;
-	struct bnxt_ulp_mapper_data *mapper_data;
-	int32_t rc = 0;
-
-	glbl_tmpl_list = ulp_mapper_glb_template_table_get(&num_glb_tmpls);
-	if (!glbl_tmpl_list || !num_glb_tmpls)
-		return rc; /* No global templates to process */
-
-	/* Get the device id from the ulp context */
-	if (bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id)) {
-		BNXT_TF_DBG(ERR, "Invalid ulp context\n");
-		return -EINVAL;
-	}
-
-	mapper_data = bnxt_ulp_cntxt_ptr2_mapper_data_get(ulp_ctx);
-	if (!mapper_data) {
-		BNXT_TF_DBG(ERR, "Failed to get the ulp mapper data\n");
-		return -EINVAL;
-	}
-
-	/* Iterate the global resources and process each one */
-	for (idx = 0; idx < num_glb_tmpls; idx++) {
-		/* Initialize the parms structure */
-		memset(&parms, 0, sizeof(parms));
-		parms.tfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx);
-		parms.ulp_ctx = ulp_ctx;
-		parms.dev_id = dev_id;
-		parms.mapper_data = mapper_data;
-		parms.flow_type = BNXT_ULP_FDB_TYPE_DEFAULT;
-		parms.tmpl_type = BNXT_ULP_TEMPLATE_TYPE_CLASS;
-
-		/* Get the class table entry from dev id and class id */
-		parms.class_tid = glbl_tmpl_list[idx];
-
-		parms.device_params = bnxt_ulp_device_params_get(parms.dev_id);
-		if (!parms.device_params) {
-			BNXT_TF_DBG(ERR, "No device for device id %d\n",
-				    parms.dev_id);
-			return -EINVAL;
-		}
-
-		rc = ulp_mapper_tbls_process(&parms, parms.class_tid);
-		if (rc)
-			return rc;
-	}
-	return rc;
-}
-
 /* Function to handle the mapping of the Flow to be compatible
  * with the underlying hardware.
  */
@@ -3442,6 +3496,7 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx,
 		rc = ulp_mapper_tbls_process(&parms, parms.act_tid);
 		if (rc)
 			goto flow_error;
+		cparms->shared_hndl = parms.shared_hndl;
 	}
 
 	if (parms.class_tid) {
@@ -3520,13 +3575,6 @@ ulp_mapper_init(struct bnxt_ulp_context *ulp_ctx)
 		goto error;
 	}
 
-	/* Allocate global template table entries */
-	rc = ulp_mapper_glb_template_table_init(ulp_ctx);
-	if (rc) {
-		BNXT_TF_DBG(ERR, "Failed to initialize global templates\n");
-		goto error;
-	}
-
 	return 0;
 error:
 	/* Ignore the return code in favor of returning the original error. */
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.h b/drivers/net/bnxt/tf_ulp/ulp_mapper.h
index 8f0b894d39..8652dd203c 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.h
@@ -82,6 +82,7 @@ struct bnxt_ulp_mapper_create_parms {
 	/* if set then create a parent flow */
 	uint32_t			parent_flow;
 	uint8_t				tun_idx;
+	uint64_t			shared_hndl;
 
 	/* support pattern based rejection */
 	uint32_t			flow_pattern_id;
@@ -120,4 +121,10 @@ ulp_mapper_resources_free(struct bnxt_ulp_context *ulp_ctx,
 			  enum bnxt_ulp_fdb_type flow_type,
 			  uint32_t fid);
 
+int32_t
+ulp_mapper_get_shared_fid(struct bnxt_ulp_context *ulp,
+			  uint32_t id,
+			  uint16_t key,
+			  uint32_t *fid);
+
 #endif /* _ULP_MAPPER_H_ */
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.c
index 8b8dccf9f1..271520e1d3 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -73,6 +73,12 @@ ulp_mark_db_init(struct bnxt_ulp_context *ctxt)
 		return -EINVAL;
 	}
 
+	if (!dparms->mark_db_lfid_entries || !dparms->mark_db_gfid_entries) {
+		BNXT_TF_DBG(DEBUG, "mark Table is not allocated\n");
+		bnxt_ulp_cntxt_ptr2_mark_db_set(ctxt, NULL);
+		return 0;
+	}
+
 	mark_tbl = rte_zmalloc("ulp_rx_mark_tbl_ptr",
 			       sizeof(struct bnxt_ulp_mark_tbl), 0);
 	if (!mark_tbl)
@@ -182,10 +188,8 @@ ulp_mark_db_mark_get(struct bnxt_ulp_context *ctxt,
 		return -EINVAL;
 
 	mtbl = bnxt_ulp_cntxt_ptr2_mark_db_get(ctxt);
-	if (!mtbl) {
-		BNXT_TF_DBG(ERR, "Unable to get Mark Table\n");
+	if (!mtbl)
 		return -EINVAL;
-	}
 
 	idx = ulp_mark_db_idx_get(is_gfid, fid, mtbl);
 
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.h b/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.h
index 9696730cc2..d9d82d4644 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2019 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
diff --git a/drivers/net/bnxt/tf_ulp/ulp_matcher.c b/drivers/net/bnxt/tf_ulp/ulp_matcher.c
index 21eb97b7eb..46ac57ac00 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_matcher.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_matcher.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
diff --git a/drivers/net/bnxt/tf_ulp/ulp_matcher.h b/drivers/net/bnxt/tf_ulp/ulp_matcher.h
index a582188252..dc2487889c 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_matcher.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_matcher.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.c b/drivers/net/bnxt/tf_ulp/ulp_port_db.c
index 2ee79ea3fe..96fc456d4c 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -8,6 +8,7 @@
 #include "bnxt_vnic.h"
 #include "bnxt_tf_common.h"
 #include "ulp_port_db.h"
+#include "tfp.h"
 
 static uint32_t
 ulp_port_db_allocate_ifindex(struct bnxt_ulp_port_db *port_db)
@@ -186,6 +187,7 @@ int32_t	ulp_port_db_dev_port_intf_update(struct bnxt_ulp_context *ulp_ctxt,
 	 * the kernel. And to send it to the kernel, we need the PF's vnic id.
 	 */
 	func->func_parent_vnic = bnxt_get_parent_vnic_id(port_id, intf->type);
+	func->func_parent_vnic = tfp_cpu_to_be_16(func->func_parent_vnic);
 	bnxt_get_iface_mac(port_id, intf->type, func->func_mac,
 			   func->func_parent_mac);
 
@@ -587,11 +589,32 @@ ulp_port_db_port_func_id_get(struct bnxt_ulp_context *ulp_ctxt,
 	return 0;
 }
 
+/* internal function to get the */
+static struct ulp_func_if_info*
+ulp_port_db_func_if_info_get(struct bnxt_ulp_context *ulp_ctxt,
+			     uint32_t port_id)
+{
+	struct bnxt_ulp_port_db *port_db;
+	uint16_t func_id;
+
+	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
+	if (ulp_port_db_port_func_id_get(ulp_ctxt, port_id, &func_id)) {
+		BNXT_TF_DBG(ERR, "Invalid port_id %x\n", port_id);
+		return NULL;
+	}
+
+	if (!port_db->ulp_func_id_tbl[func_id].func_valid) {
+		BNXT_TF_DBG(ERR, "Invalid func_id %x\n", func_id);
+		return NULL;
+	}
+	return &port_db->ulp_func_id_tbl[func_id];
+}
+
 /*
  * Api to get the parent mac address for a given port id.
  *
  * ulp_ctxt [in] Ptr to ulp context
- * port_id [in].device port id
+ * port_id [in] device port id
  * mac_addr [out] mac address
  *
  * Returns 0 on success or negative number on failure.
@@ -600,19 +623,58 @@ int32_t
 ulp_port_db_parent_mac_addr_get(struct bnxt_ulp_context *ulp_ctxt,
 				uint32_t port_id, uint8_t **mac_addr)
 {
-	struct bnxt_ulp_port_db *port_db;
-	uint16_t func_id;
+	struct ulp_func_if_info *info;
 
-	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
-	if (ulp_port_db_port_func_id_get(ulp_ctxt, port_id, &func_id)) {
-		BNXT_TF_DBG(ERR, "Invalid port_id %x\n", port_id);
-		return -EINVAL;
+	info = ulp_port_db_func_if_info_get(ulp_ctxt, port_id);
+	if (info) {
+		*mac_addr = info->func_parent_mac;
+		return 0;
 	}
+	return -EINVAL;
+}
 
-	if (!port_db->ulp_func_id_tbl[func_id].func_valid) {
-		BNXT_TF_DBG(ERR, "Invalid func_id %x\n", func_id);
-		return -ENOENT;
+/*
+ * Api to get the mac address for a given port id.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * port_id [in] device port id
+ * mac_addr [out] mac address
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_drv_mac_addr_get(struct bnxt_ulp_context *ulp_ctxt,
+			     uint32_t port_id, uint8_t **mac_addr)
+{
+	struct ulp_func_if_info *info;
+
+	info = ulp_port_db_func_if_info_get(ulp_ctxt, port_id);
+	if (info) {
+		*mac_addr = info->func_mac;
+		return 0;
 	}
-	*mac_addr = port_db->ulp_func_id_tbl[func_id].func_parent_mac;
-	return 0;
+	return -EINVAL;
+}
+
+/*
+ * Api to get the parent vnic for a given port id.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * port_id [in] device port id
+ * vnic [out] parent vnic
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_parent_vnic_get(struct bnxt_ulp_context *ulp_ctxt,
+			    uint32_t port_id, uint8_t **vnic)
+{
+	struct ulp_func_if_info *info;
+
+	info = ulp_port_db_func_if_info_get(ulp_ctxt, port_id);
+	if (info) {
+		*vnic = (uint8_t *)&info->func_parent_vnic;
+		return 0;
+	}
+	return -EINVAL;
 }
diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.h b/drivers/net/bnxt/tf_ulp/ulp_port_db.h
index b10a7ea58c..740c186e12 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2019 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -279,7 +279,7 @@ ulp_port_db_port_func_id_get(struct bnxt_ulp_context *ulp_ctxt,
  * Api to get the parent mac address for a given port id.
  *
  * ulp_ctxt [in] Ptr to ulp context
- * port_id [in].device port id
+ * port_id [in] device port id
  * mac_addr [out] mac address
  *
  * Returns 0 on success or negative number on failure.
@@ -287,4 +287,31 @@ ulp_port_db_port_func_id_get(struct bnxt_ulp_context *ulp_ctxt,
 int32_t
 ulp_port_db_parent_mac_addr_get(struct bnxt_ulp_context *ulp_ctxt,
 				uint32_t port_id, uint8_t **mac_addr);
+
+/*
+ * Api to get the mac address for a given port id.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * port_id [in] device port id
+ * mac_addr [out] mac address
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_drv_mac_addr_get(struct bnxt_ulp_context *ulp_ctxt,
+			     uint32_t port_id, uint8_t **mac_addr);
+
+/*
+ * Api to get the parent vnic for a given port id.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * port_id [in] device port id
+ * vnic [out] parent vnic
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_parent_vnic_get(struct bnxt_ulp_context *ulp_ctxt,
+			    uint32_t port_id, uint8_t **vnic);
+
 #endif /* _ULP_PORT_DB_H_ */
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 8e466255d9..7bd499faa6 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -208,6 +208,10 @@ struct bnxt_ulp_rte_act_info ulp_act_info[] = {
 	[RTE_FLOW_ACTION_TYPE_DEC_TCP_ACK] = {
 	.act_type                = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED,
 	.proto_act_func          = NULL
+	},
+	[RTE_FLOW_ACTION_TYPE_SAMPLE] = {
+	.act_type                = BNXT_ULP_ACT_TYPE_SUPPORTED,
+	.proto_act_func          = ulp_rte_sample_act_handler
 	}
 };
 
@@ -230,8 +234,8 @@ struct bnxt_ulp_rte_hdr_info ulp_hdr_info[] = {
 	.proto_hdr_func          = NULL
 	},
 	[RTE_FLOW_ITEM_TYPE_ANY] = {
-	.hdr_type                = BNXT_ULP_HDR_TYPE_NOT_SUPPORTED,
-	.proto_hdr_func          = NULL
+	.hdr_type                = BNXT_ULP_HDR_TYPE_SUPPORTED,
+	.proto_hdr_func          = ulp_rte_item_any_handler
 	},
 	[RTE_FLOW_ITEM_TYPE_PF] = {
 	.hdr_type                = BNXT_ULP_HDR_TYPE_SUPPORTED,
@@ -270,8 +274,8 @@ struct bnxt_ulp_rte_hdr_info ulp_hdr_info[] = {
 	.proto_hdr_func          = ulp_rte_ipv6_hdr_handler
 	},
 	[RTE_FLOW_ITEM_TYPE_ICMP] = {
-	.hdr_type                = BNXT_ULP_HDR_TYPE_NOT_SUPPORTED,
-	.proto_hdr_func          = NULL
+	.hdr_type                = BNXT_ULP_HDR_TYPE_SUPPORTED,
+	.proto_hdr_func          = ulp_rte_icmp_hdr_handler
 	},
 	[RTE_FLOW_ITEM_TYPE_UDP] = {
 	.hdr_type                = BNXT_ULP_HDR_TYPE_SUPPORTED,
@@ -302,8 +306,8 @@ struct bnxt_ulp_rte_hdr_info ulp_hdr_info[] = {
 	.proto_hdr_func          = NULL
 	},
 	[RTE_FLOW_ITEM_TYPE_GRE] = {
-	.hdr_type                = BNXT_ULP_HDR_TYPE_NOT_SUPPORTED,
-	.proto_hdr_func          = NULL
+	.hdr_type                = BNXT_ULP_HDR_TYPE_SUPPORTED,
+	.proto_hdr_func          = ulp_rte_gre_hdr_handler
 	},
 	[RTE_FLOW_ITEM_TYPE_FUZZY] = {
 	.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 1522328a5d..0e585e502e 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -874,6 +874,32 @@ ulp_rte_l3_proto_type_update(struct ulp_rte_parser_params *param,
 				       BNXT_ULP_HDR_BIT_O_TCP);
 			ULP_COMP_FLD_IDX_WR(param, BNXT_ULP_CF_IDX_O_L4, 1);
 		}
+	} else if (proto == IPPROTO_GRE) {
+		ULP_BITMAP_SET(param->hdr_bitmap.bits, BNXT_ULP_HDR_BIT_T_GRE);
+	} else if (proto == IPPROTO_ICMP) {
+		if (ULP_COMP_FLD_IDX_RD(param, BNXT_ULP_CF_IDX_L3_TUN))
+			ULP_BITMAP_SET(param->hdr_bitmap.bits,
+				       BNXT_ULP_HDR_BIT_I_ICMP);
+		else
+			ULP_BITMAP_SET(param->hdr_bitmap.bits,
+				       BNXT_ULP_HDR_BIT_O_ICMP);
+	}
+	if (proto) {
+		if (in_flag) {
+			ULP_COMP_FLD_IDX_WR(param,
+					    BNXT_ULP_CF_IDX_I_L3_FB_PROTO_ID,
+					    1);
+			ULP_COMP_FLD_IDX_WR(param,
+					    BNXT_ULP_CF_IDX_I_L3_PROTO_ID,
+					    proto);
+		} else {
+			ULP_COMP_FLD_IDX_WR(param,
+					    BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID,
+					    1);
+			ULP_COMP_FLD_IDX_WR(param,
+					    BNXT_ULP_CF_IDX_O_L3_PROTO_ID,
+					    proto);
+		}
 	}
 }
 
@@ -1022,9 +1048,6 @@ ulp_rte_ipv4_hdr_handler(const struct rte_flow_item *item,
 	if (ipv4_mask)
 		proto &= ipv4_mask->hdr.next_proto_id;
 
-	if (proto == IPPROTO_GRE)
-		ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_T_GRE);
-
 	/* Update the field protocol hdr bitmap */
 	ulp_rte_l3_proto_type_update(params, proto, inner_flag);
 	ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_L3_HDR_CNT, ++cnt);
@@ -1170,9 +1193,6 @@ ulp_rte_ipv6_hdr_handler(const struct rte_flow_item *item,
 	if (ipv6_mask)
 		proto &= ipv6_mask->hdr.proto;
 
-	if (proto == IPPROTO_GRE)
-		ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_T_GRE);
-
 	/* Update the field protocol hdr bitmap */
 	ulp_rte_l3_proto_type_update(params, proto, inner_flag);
 	ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_L3_HDR_CNT, ++cnt);
@@ -1185,11 +1205,16 @@ static void
 ulp_rte_l4_proto_type_update(struct ulp_rte_parser_params *param,
 			     uint16_t dst_port)
 {
-	if (dst_port == tfp_cpu_to_be_16(ULP_UDP_PORT_VXLAN)) {
+	if (dst_port == tfp_cpu_to_be_16(ULP_UDP_PORT_VXLAN))
 		ULP_BITMAP_SET(param->hdr_fp_bit.bits,
 			       BNXT_ULP_HDR_BIT_T_VXLAN);
+
+	if (ULP_BITMAP_ISSET(param->hdr_bitmap.bits,
+			     BNXT_ULP_HDR_BIT_T_VXLAN) ||
+	    ULP_BITMAP_ISSET(param->hdr_bitmap.bits,
+			     BNXT_ULP_HDR_BIT_T_GRE))
 		ULP_COMP_FLD_IDX_WR(param, BNXT_ULP_CF_IDX_L3_TUN, 1);
-	}
+
 }
 
 /* Function to handle the parsing of RTE Flow item UDP Header. */
@@ -1203,7 +1228,7 @@ ulp_rte_udp_hdr_handler(const struct rte_flow_item *item,
 	struct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;
 	uint32_t idx = params->field_idx;
 	uint32_t size;
-	uint16_t dport = 0;
+	uint16_t dport = 0, sport = 0;
 	uint32_t cnt;
 
 	cnt = ULP_COMP_FLD_IDX_RD(params, BNXT_ULP_CF_IDX_L4_HDR_CNT);
@@ -1221,6 +1246,7 @@ ulp_rte_udp_hdr_handler(const struct rte_flow_item *item,
 		field = ulp_rte_parser_fld_copy(&params->hdr_field[idx],
 						&udp_spec->hdr.src_port,
 						size);
+		sport = udp_spec->hdr.src_port;
 		size = sizeof(udp_spec->hdr.dst_port);
 		field = ulp_rte_parser_fld_copy(field,
 						&udp_spec->hdr.dst_port,
@@ -1258,6 +1284,14 @@ ulp_rte_udp_hdr_handler(const struct rte_flow_item *item,
 	    ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_TCP)) {
 		ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_UDP);
 		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L4, 1);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L4_SRC_PORT,
+				    (uint32_t)rte_be_to_cpu_16(sport));
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L4_DST_PORT,
+				    (uint32_t)rte_be_to_cpu_16(dport));
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L3_FB_PROTO_ID,
+				    1);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L3_PROTO_ID,
+				    IPPROTO_UDP);
 		if (udp_mask && udp_mask->hdr.src_port)
 			ULP_COMP_FLD_IDX_WR(params,
 					    BNXT_ULP_CF_IDX_I_L4_FB_SRC_PORT,
@@ -1266,10 +1300,17 @@ ulp_rte_udp_hdr_handler(const struct rte_flow_item *item,
 			ULP_COMP_FLD_IDX_WR(params,
 					    BNXT_ULP_CF_IDX_I_L4_FB_DST_PORT,
 					    1);
-
 	} else {
 		ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_UDP);
 		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L4, 1);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L4_SRC_PORT,
+				    (uint32_t)rte_be_to_cpu_16(sport));
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L4_DST_PORT,
+				    (uint32_t)rte_be_to_cpu_16(dport));
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID,
+				    1);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L3_PROTO_ID,
+				    IPPROTO_UDP);
 		if (udp_mask && udp_mask->hdr.src_port)
 			ULP_COMP_FLD_IDX_WR(params,
 					    BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT,
@@ -1296,6 +1337,7 @@ ulp_rte_tcp_hdr_handler(const struct rte_flow_item *item,
 	struct ulp_rte_hdr_field *field;
 	struct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;
 	uint32_t idx = params->field_idx;
+	uint16_t dport = 0, sport = 0;
 	uint32_t size;
 	uint32_t cnt;
 
@@ -1310,10 +1352,12 @@ ulp_rte_tcp_hdr_handler(const struct rte_flow_item *item,
 	 * header fields
 	 */
 	if (tcp_spec) {
+		sport = tcp_spec->hdr.src_port;
 		size = sizeof(tcp_spec->hdr.src_port);
 		field = ulp_rte_parser_fld_copy(&params->hdr_field[idx],
 						&tcp_spec->hdr.src_port,
 						size);
+		dport = tcp_spec->hdr.dst_port;
 		size = sizeof(tcp_spec->hdr.dst_port);
 		field = ulp_rte_parser_fld_copy(field,
 						&tcp_spec->hdr.dst_port,
@@ -1387,6 +1431,14 @@ ulp_rte_tcp_hdr_handler(const struct rte_flow_item *item,
 	    ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_TCP)) {
 		ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_TCP);
 		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L4, 1);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L4_SRC_PORT,
+				    (uint32_t)rte_be_to_cpu_16(sport));
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L4_DST_PORT,
+				    (uint32_t)rte_be_to_cpu_16(dport));
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L3_FB_PROTO_ID,
+				    1);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L3_PROTO_ID,
+				    IPPROTO_TCP);
 		if (tcp_mask && tcp_mask->hdr.src_port)
 			ULP_COMP_FLD_IDX_WR(params,
 					    BNXT_ULP_CF_IDX_I_L4_FB_SRC_PORT,
@@ -1398,6 +1450,14 @@ ulp_rte_tcp_hdr_handler(const struct rte_flow_item *item,
 	} else {
 		ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_TCP);
 		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L4, 1);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L4_SRC_PORT,
+				    (uint32_t)rte_be_to_cpu_16(sport));
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L4_DST_PORT,
+				    (uint32_t)rte_be_to_cpu_16(dport));
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID,
+				    1);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L3_PROTO_ID,
+				    IPPROTO_TCP);
 		if (tcp_mask && tcp_mask->hdr.src_port)
 			ULP_COMP_FLD_IDX_WR(params,
 					    BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT,
@@ -1464,6 +1524,7 @@ ulp_rte_vxlan_hdr_handler(const struct rte_flow_item *item,
 
 	/* Update the hdr_bitmap with vxlan */
 	ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_T_VXLAN);
+	ulp_rte_l4_proto_type_update(params, 0);
 	return BNXT_TF_RC_SUCCESS;
 }
 
@@ -1479,11 +1540,6 @@ ulp_rte_gre_hdr_handler(const struct rte_flow_item *item,
 	uint32_t size;
 	struct ulp_rte_hdr_field *field;
 
-	if (!gre_spec && !gre_mask) {
-		BNXT_TF_DBG(ERR, "Parse Error: GRE item is invalid\n");
-		return BNXT_TF_RC_ERROR;
-	}
-
 	if (gre_spec) {
 		size = sizeof(gre_spec->c_rsvd0_ver);
 		field = ulp_rte_parser_fld_copy(&params->hdr_field[idx],
@@ -1507,6 +1563,7 @@ ulp_rte_gre_hdr_handler(const struct rte_flow_item *item,
 
 	/* Update the hdr_bitmap with GRE */
 	ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_T_GRE);
+	ulp_rte_l4_proto_type_update(params, 0);
 	return BNXT_TF_RC_SUCCESS;
 }
 
@@ -1518,6 +1575,68 @@ ulp_rte_item_any_handler(const struct rte_flow_item *item __rte_unused,
 	return BNXT_TF_RC_SUCCESS;
 }
 
+/* Function to handle the parsing of RTE Flow item ICMP Header. */
+int32_t
+ulp_rte_icmp_hdr_handler(const struct rte_flow_item *item,
+			 struct ulp_rte_parser_params *params)
+{
+	const struct rte_flow_item_icmp *icmp_spec = item->spec;
+	const struct rte_flow_item_icmp *icmp_mask = item->mask;
+	struct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;
+	uint32_t idx = params->field_idx;
+	uint32_t size;
+	struct ulp_rte_hdr_field *field;
+
+	if (icmp_spec) {
+		size = sizeof(icmp_spec->hdr.icmp_type);
+		field = ulp_rte_parser_fld_copy(&params->hdr_field[idx],
+						&icmp_spec->hdr.icmp_type,
+						size);
+		size = sizeof(icmp_spec->hdr.icmp_code);
+		field = ulp_rte_parser_fld_copy(field,
+						&icmp_spec->hdr.icmp_code,
+						size);
+		size = sizeof(icmp_spec->hdr.icmp_cksum);
+		field = ulp_rte_parser_fld_copy(field,
+						&icmp_spec->hdr.icmp_cksum,
+						size);
+		size = sizeof(icmp_spec->hdr.icmp_ident);
+		field = ulp_rte_parser_fld_copy(field,
+						&icmp_spec->hdr.icmp_ident,
+						size);
+		size = sizeof(icmp_spec->hdr.icmp_seq_nb);
+		field = ulp_rte_parser_fld_copy(field,
+						&icmp_spec->hdr.icmp_seq_nb,
+						size);
+	}
+	if (icmp_mask) {
+		ulp_rte_prsr_mask_copy(params, &idx,
+				       &icmp_mask->hdr.icmp_type,
+				       sizeof(icmp_mask->hdr.icmp_type));
+		ulp_rte_prsr_mask_copy(params, &idx,
+				       &icmp_mask->hdr.icmp_code,
+				       sizeof(icmp_mask->hdr.icmp_code));
+		ulp_rte_prsr_mask_copy(params, &idx,
+				       &icmp_mask->hdr.icmp_cksum,
+				       sizeof(icmp_mask->hdr.icmp_cksum));
+		ulp_rte_prsr_mask_copy(params, &idx,
+				       &icmp_mask->hdr.icmp_ident,
+				       sizeof(icmp_mask->hdr.icmp_ident));
+		ulp_rte_prsr_mask_copy(params, &idx,
+				       &icmp_mask->hdr.icmp_seq_nb,
+				       sizeof(icmp_mask->hdr.icmp_seq_nb));
+	}
+	/* Add number of GRE header elements */
+	params->field_idx += BNXT_ULP_PROTO_HDR_ICMP_NUM;
+
+	/* Update the hdr_bitmap with ICMP */
+	if (ULP_COMP_FLD_IDX_RD(params, BNXT_ULP_CF_IDX_L3_TUN))
+		ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_ICMP);
+	else
+		ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_ICMP);
+	return BNXT_TF_RC_SUCCESS;
+}
+
 /* Function to handle the parsing of RTE Flow item void Header */
 int32_t
 ulp_rte_void_hdr_handler(const struct rte_flow_item *item __rte_unused,
@@ -1872,7 +1991,6 @@ ulp_rte_drop_act_handler(const struct rte_flow_action *action_item __rte_unused,
 int32_t
 ulp_rte_count_act_handler(const struct rte_flow_action *action_item,
 			  struct ulp_rte_parser_params *params)
-
 {
 	const struct rte_flow_action_count *act_count;
 	struct ulp_rte_act_prop *act_prop = &params->act_prop;
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
index 48a20e84b1..664878401a 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -135,6 +135,11 @@ int32_t
 ulp_rte_item_any_handler(const struct rte_flow_item *item __rte_unused,
 			 struct ulp_rte_parser_params *params __rte_unused);
 
+/* Function to handle the parsing of RTE Flow item ICMP Header. */
+int32_t
+ulp_rte_icmp_hdr_handler(const struct rte_flow_item *item,
+			 struct ulp_rte_parser_params *params);
+
 /* Function to handle the parsing of RTE Flow item void Header. */
 int32_t
 ulp_rte_void_hdr_handler(const struct rte_flow_item *item,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
index c848b70777..500bf215d9 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
index 5c7b95bd08..e9e7feb64c 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
-/* date: Fri Jan 29 09:44:41 2021 */
+/* date: Wed Mar  3 12:15:37 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -16,16643 +16,17795 @@
  * maps hash id to ulp_class_match_list[] index
  */
 uint16_t ulp_class_sig_tbl[BNXT_ULP_CLASS_SIG_TBL_MAX_SZ] = {
-	[BNXT_ULP_CLASS_HID_26d1] = 1,
-	[BNXT_ULP_CLASS_HID_0071] = 2,
-	[BNXT_ULP_CLASS_HID_53a5] = 3,
-	[BNXT_ULP_CLASS_HID_1d49] = 4,
-	[BNXT_ULP_CLASS_HID_2095] = 5,
-	[BNXT_ULP_CLASS_HID_5701] = 6,
-	[BNXT_ULP_CLASS_HID_4d79] = 7,
-	[BNXT_ULP_CLASS_HID_170d] = 8,
-	[BNXT_ULP_CLASS_HID_1a69] = 9,
-	[BNXT_ULP_CLASS_HID_50c5] = 10,
-	[BNXT_ULP_CLASS_HID_473d] = 11,
-	[BNXT_ULP_CLASS_HID_10c1] = 12,
-	[BNXT_ULP_CLASS_HID_142d] = 13,
-	[BNXT_ULP_CLASS_HID_4a99] = 14,
-	[BNXT_ULP_CLASS_HID_40f1] = 15,
-	[BNXT_ULP_CLASS_HID_0a85] = 16,
-	[BNXT_ULP_CLASS_HID_0179] = 17,
-	[BNXT_ULP_CLASS_HID_37d5] = 18,
-	[BNXT_ULP_CLASS_HID_2e4d] = 19,
-	[BNXT_ULP_CLASS_HID_54ad] = 20,
-	[BNXT_ULP_CLASS_HID_5809] = 21,
-	[BNXT_ULP_CLASS_HID_31a9] = 22,
-	[BNXT_ULP_CLASS_HID_2801] = 23,
-	[BNXT_ULP_CLASS_HID_4e61] = 24,
-	[BNXT_ULP_CLASS_HID_2561] = 25,
-	[BNXT_ULP_CLASS_HID_2bad] = 26,
-	[BNXT_ULP_CLASS_HID_054d] = 27,
-	[BNXT_ULP_CLASS_HID_5bdd] = 28,
-	[BNXT_ULP_CLASS_HID_26f1] = 29,
-	[BNXT_ULP_CLASS_HID_13cf1] = 30,
-	[BNXT_ULP_CLASS_HID_252f1] = 31,
-	[BNXT_ULP_CLASS_HID_30c25] = 32,
-	[BNXT_ULP_CLASS_HID_0051] = 33,
-	[BNXT_ULP_CLASS_HID_11651] = 34,
-	[BNXT_ULP_CLASS_HID_22c51] = 35,
-	[BNXT_ULP_CLASS_HID_34251] = 36,
-	[BNXT_ULP_CLASS_HID_5385] = 37,
-	[BNXT_ULP_CLASS_HID_10cc9] = 38,
-	[BNXT_ULP_CLASS_HID_222c9] = 39,
-	[BNXT_ULP_CLASS_HID_338c9] = 40,
-	[BNXT_ULP_CLASS_HID_1d69] = 41,
-	[BNXT_ULP_CLASS_HID_13369] = 42,
-	[BNXT_ULP_CLASS_HID_24969] = 43,
-	[BNXT_ULP_CLASS_HID_3025d] = 44,
-	[BNXT_ULP_CLASS_HID_20b5] = 45,
-	[BNXT_ULP_CLASS_HID_136b5] = 46,
-	[BNXT_ULP_CLASS_HID_24cb5] = 47,
-	[BNXT_ULP_CLASS_HID_305f9] = 48,
-	[BNXT_ULP_CLASS_HID_5721] = 49,
-	[BNXT_ULP_CLASS_HID_11015] = 50,
-	[BNXT_ULP_CLASS_HID_22615] = 51,
-	[BNXT_ULP_CLASS_HID_33c15] = 52,
-	[BNXT_ULP_CLASS_HID_4d59] = 53,
-	[BNXT_ULP_CLASS_HID_1068d] = 54,
-	[BNXT_ULP_CLASS_HID_21c8d] = 55,
-	[BNXT_ULP_CLASS_HID_3328d] = 56,
-	[BNXT_ULP_CLASS_HID_172d] = 57,
-	[BNXT_ULP_CLASS_HID_12d2d] = 58,
-	[BNXT_ULP_CLASS_HID_2432d] = 59,
-	[BNXT_ULP_CLASS_HID_3592d] = 60,
-	[BNXT_ULP_CLASS_HID_1a49] = 61,
-	[BNXT_ULP_CLASS_HID_13049] = 62,
-	[BNXT_ULP_CLASS_HID_24649] = 63,
-	[BNXT_ULP_CLASS_HID_35c49] = 64,
-	[BNXT_ULP_CLASS_HID_50e5] = 65,
-	[BNXT_ULP_CLASS_HID_10a29] = 66,
-	[BNXT_ULP_CLASS_HID_22029] = 67,
-	[BNXT_ULP_CLASS_HID_33629] = 68,
-	[BNXT_ULP_CLASS_HID_471d] = 69,
-	[BNXT_ULP_CLASS_HID_10041] = 70,
-	[BNXT_ULP_CLASS_HID_21641] = 71,
-	[BNXT_ULP_CLASS_HID_32c41] = 72,
-	[BNXT_ULP_CLASS_HID_10e1] = 73,
-	[BNXT_ULP_CLASS_HID_126e1] = 74,
-	[BNXT_ULP_CLASS_HID_23ce1] = 75,
-	[BNXT_ULP_CLASS_HID_352e1] = 76,
-	[BNXT_ULP_CLASS_HID_140d] = 77,
-	[BNXT_ULP_CLASS_HID_12a0d] = 78,
-	[BNXT_ULP_CLASS_HID_2400d] = 79,
-	[BNXT_ULP_CLASS_HID_3560d] = 80,
-	[BNXT_ULP_CLASS_HID_4ab9] = 81,
-	[BNXT_ULP_CLASS_HID_103ed] = 82,
-	[BNXT_ULP_CLASS_HID_219ed] = 83,
-	[BNXT_ULP_CLASS_HID_32fed] = 84,
-	[BNXT_ULP_CLASS_HID_40d1] = 85,
-	[BNXT_ULP_CLASS_HID_156d1] = 86,
-	[BNXT_ULP_CLASS_HID_21005] = 87,
-	[BNXT_ULP_CLASS_HID_32605] = 88,
-	[BNXT_ULP_CLASS_HID_0aa5] = 89,
-	[BNXT_ULP_CLASS_HID_120a5] = 90,
-	[BNXT_ULP_CLASS_HID_236a5] = 91,
-	[BNXT_ULP_CLASS_HID_34ca5] = 92,
-	[BNXT_ULP_CLASS_HID_0159] = 93,
-	[BNXT_ULP_CLASS_HID_11759] = 94,
-	[BNXT_ULP_CLASS_HID_22d59] = 95,
-	[BNXT_ULP_CLASS_HID_34359] = 96,
-	[BNXT_ULP_CLASS_HID_37f5] = 97,
-	[BNXT_ULP_CLASS_HID_14df5] = 98,
-	[BNXT_ULP_CLASS_HID_20739] = 99,
-	[BNXT_ULP_CLASS_HID_31d39] = 100,
-	[BNXT_ULP_CLASS_HID_2e6d] = 101,
-	[BNXT_ULP_CLASS_HID_1446d] = 102,
-	[BNXT_ULP_CLASS_HID_25a6d] = 103,
-	[BNXT_ULP_CLASS_HID_31351] = 104,
-	[BNXT_ULP_CLASS_HID_548d] = 105,
-	[BNXT_ULP_CLASS_HID_10df1] = 106,
-	[BNXT_ULP_CLASS_HID_223f1] = 107,
-	[BNXT_ULP_CLASS_HID_339f1] = 108,
-	[BNXT_ULP_CLASS_HID_5829] = 109,
-	[BNXT_ULP_CLASS_HID_1111d] = 110,
-	[BNXT_ULP_CLASS_HID_2271d] = 111,
-	[BNXT_ULP_CLASS_HID_33d1d] = 112,
-	[BNXT_ULP_CLASS_HID_3189] = 113,
-	[BNXT_ULP_CLASS_HID_14789] = 114,
-	[BNXT_ULP_CLASS_HID_200fd] = 115,
-	[BNXT_ULP_CLASS_HID_316fd] = 116,
-	[BNXT_ULP_CLASS_HID_2821] = 117,
-	[BNXT_ULP_CLASS_HID_13e21] = 118,
-	[BNXT_ULP_CLASS_HID_25421] = 119,
-	[BNXT_ULP_CLASS_HID_30d15] = 120,
-	[BNXT_ULP_CLASS_HID_4e41] = 121,
-	[BNXT_ULP_CLASS_HID_107b5] = 122,
-	[BNXT_ULP_CLASS_HID_21db5] = 123,
-	[BNXT_ULP_CLASS_HID_333b5] = 124,
-	[BNXT_ULP_CLASS_HID_2541] = 125,
-	[BNXT_ULP_CLASS_HID_2b8d] = 126,
-	[BNXT_ULP_CLASS_HID_056d] = 127,
-	[BNXT_ULP_CLASS_HID_5bfd] = 128,
-	[BNXT_ULP_CLASS_HID_2691] = 129,
-	[BNXT_ULP_CLASS_HID_13c91] = 130,
-	[BNXT_ULP_CLASS_HID_25291] = 131,
-	[BNXT_ULP_CLASS_HID_30c45] = 132,
-	[BNXT_ULP_CLASS_HID_0031] = 133,
-	[BNXT_ULP_CLASS_HID_11631] = 134,
-	[BNXT_ULP_CLASS_HID_22c31] = 135,
-	[BNXT_ULP_CLASS_HID_34231] = 136,
-	[BNXT_ULP_CLASS_HID_53e5] = 137,
-	[BNXT_ULP_CLASS_HID_10ca9] = 138,
-	[BNXT_ULP_CLASS_HID_222a9] = 139,
-	[BNXT_ULP_CLASS_HID_338a9] = 140,
-	[BNXT_ULP_CLASS_HID_1d09] = 141,
-	[BNXT_ULP_CLASS_HID_13309] = 142,
-	[BNXT_ULP_CLASS_HID_24909] = 143,
-	[BNXT_ULP_CLASS_HID_3023d] = 144,
-	[BNXT_ULP_CLASS_HID_20d5] = 145,
-	[BNXT_ULP_CLASS_HID_136d5] = 146,
-	[BNXT_ULP_CLASS_HID_24cd5] = 147,
-	[BNXT_ULP_CLASS_HID_30599] = 148,
-	[BNXT_ULP_CLASS_HID_5741] = 149,
-	[BNXT_ULP_CLASS_HID_11075] = 150,
-	[BNXT_ULP_CLASS_HID_22675] = 151,
-	[BNXT_ULP_CLASS_HID_33c75] = 152,
-	[BNXT_ULP_CLASS_HID_4d39] = 153,
-	[BNXT_ULP_CLASS_HID_106ed] = 154,
-	[BNXT_ULP_CLASS_HID_21ced] = 155,
-	[BNXT_ULP_CLASS_HID_332ed] = 156,
-	[BNXT_ULP_CLASS_HID_174d] = 157,
-	[BNXT_ULP_CLASS_HID_12d4d] = 158,
-	[BNXT_ULP_CLASS_HID_2434d] = 159,
-	[BNXT_ULP_CLASS_HID_3594d] = 160,
-	[BNXT_ULP_CLASS_HID_1a29] = 161,
-	[BNXT_ULP_CLASS_HID_13029] = 162,
-	[BNXT_ULP_CLASS_HID_24629] = 163,
-	[BNXT_ULP_CLASS_HID_35c29] = 164,
-	[BNXT_ULP_CLASS_HID_5085] = 165,
-	[BNXT_ULP_CLASS_HID_10a49] = 166,
-	[BNXT_ULP_CLASS_HID_22049] = 167,
-	[BNXT_ULP_CLASS_HID_33649] = 168,
-	[BNXT_ULP_CLASS_HID_477d] = 169,
-	[BNXT_ULP_CLASS_HID_10021] = 170,
-	[BNXT_ULP_CLASS_HID_21621] = 171,
-	[BNXT_ULP_CLASS_HID_32c21] = 172,
-	[BNXT_ULP_CLASS_HID_1081] = 173,
-	[BNXT_ULP_CLASS_HID_12681] = 174,
-	[BNXT_ULP_CLASS_HID_23c81] = 175,
-	[BNXT_ULP_CLASS_HID_35281] = 176,
-	[BNXT_ULP_CLASS_HID_146d] = 177,
-	[BNXT_ULP_CLASS_HID_12a6d] = 178,
-	[BNXT_ULP_CLASS_HID_2406d] = 179,
-	[BNXT_ULP_CLASS_HID_3566d] = 180,
-	[BNXT_ULP_CLASS_HID_4ad9] = 181,
-	[BNXT_ULP_CLASS_HID_1038d] = 182,
-	[BNXT_ULP_CLASS_HID_2198d] = 183,
-	[BNXT_ULP_CLASS_HID_32f8d] = 184,
-	[BNXT_ULP_CLASS_HID_40b1] = 185,
-	[BNXT_ULP_CLASS_HID_156b1] = 186,
-	[BNXT_ULP_CLASS_HID_21065] = 187,
-	[BNXT_ULP_CLASS_HID_32665] = 188,
-	[BNXT_ULP_CLASS_HID_0ac5] = 189,
-	[BNXT_ULP_CLASS_HID_120c5] = 190,
-	[BNXT_ULP_CLASS_HID_236c5] = 191,
-	[BNXT_ULP_CLASS_HID_34cc5] = 192,
-	[BNXT_ULP_CLASS_HID_0139] = 193,
-	[BNXT_ULP_CLASS_HID_11739] = 194,
-	[BNXT_ULP_CLASS_HID_22d39] = 195,
-	[BNXT_ULP_CLASS_HID_34339] = 196,
-	[BNXT_ULP_CLASS_HID_3795] = 197,
-	[BNXT_ULP_CLASS_HID_14d95] = 198,
-	[BNXT_ULP_CLASS_HID_20759] = 199,
-	[BNXT_ULP_CLASS_HID_31d59] = 200,
-	[BNXT_ULP_CLASS_HID_2e0d] = 201,
-	[BNXT_ULP_CLASS_HID_1440d] = 202,
-	[BNXT_ULP_CLASS_HID_25a0d] = 203,
-	[BNXT_ULP_CLASS_HID_31331] = 204,
-	[BNXT_ULP_CLASS_HID_54ed] = 205,
-	[BNXT_ULP_CLASS_HID_10d91] = 206,
-	[BNXT_ULP_CLASS_HID_22391] = 207,
-	[BNXT_ULP_CLASS_HID_33991] = 208,
-	[BNXT_ULP_CLASS_HID_5849] = 209,
-	[BNXT_ULP_CLASS_HID_1117d] = 210,
-	[BNXT_ULP_CLASS_HID_2277d] = 211,
-	[BNXT_ULP_CLASS_HID_33d7d] = 212,
-	[BNXT_ULP_CLASS_HID_31e9] = 213,
-	[BNXT_ULP_CLASS_HID_147e9] = 214,
-	[BNXT_ULP_CLASS_HID_2009d] = 215,
-	[BNXT_ULP_CLASS_HID_3169d] = 216,
-	[BNXT_ULP_CLASS_HID_2841] = 217,
-	[BNXT_ULP_CLASS_HID_13e41] = 218,
-	[BNXT_ULP_CLASS_HID_25441] = 219,
-	[BNXT_ULP_CLASS_HID_30d75] = 220,
-	[BNXT_ULP_CLASS_HID_4e21] = 221,
-	[BNXT_ULP_CLASS_HID_107d5] = 222,
-	[BNXT_ULP_CLASS_HID_21dd5] = 223,
-	[BNXT_ULP_CLASS_HID_333d5] = 224,
-	[BNXT_ULP_CLASS_HID_2521] = 225,
-	[BNXT_ULP_CLASS_HID_2bed] = 226,
-	[BNXT_ULP_CLASS_HID_050d] = 227,
-	[BNXT_ULP_CLASS_HID_5b9d] = 228,
-	[BNXT_ULP_CLASS_HID_1865] = 229,
-	[BNXT_ULP_CLASS_HID_389d] = 230,
-	[BNXT_ULP_CLASS_HID_123d] = 231,
-	[BNXT_ULP_CLASS_HID_4ef1] = 232,
-	[BNXT_ULP_CLASS_HID_1229] = 233,
-	[BNXT_ULP_CLASS_HID_3241] = 234,
-	[BNXT_ULP_CLASS_HID_0be1] = 235,
-	[BNXT_ULP_CLASS_HID_48b5] = 236,
-	[BNXT_ULP_CLASS_HID_0bed] = 237,
-	[BNXT_ULP_CLASS_HID_2c05] = 238,
-	[BNXT_ULP_CLASS_HID_05a5] = 239,
-	[BNXT_ULP_CLASS_HID_4279] = 240,
-	[BNXT_ULP_CLASS_HID_05d1] = 241,
-	[BNXT_ULP_CLASS_HID_25c9] = 242,
-	[BNXT_ULP_CLASS_HID_5c55] = 243,
-	[BNXT_ULP_CLASS_HID_3c3d] = 244,
-	[BNXT_ULP_CLASS_HID_4fc9] = 245,
-	[BNXT_ULP_CLASS_HID_1335] = 246,
-	[BNXT_ULP_CLASS_HID_4981] = 247,
-	[BNXT_ULP_CLASS_HID_2969] = 248,
-	[BNXT_ULP_CLASS_HID_498d] = 249,
-	[BNXT_ULP_CLASS_HID_0cf9] = 250,
-	[BNXT_ULP_CLASS_HID_4345] = 251,
-	[BNXT_ULP_CLASS_HID_232d] = 252,
-	[BNXT_ULP_CLASS_HID_2579] = 253,
-	[BNXT_ULP_CLASS_HID_2bb5] = 254,
-	[BNXT_ULP_CLASS_HID_4bad] = 255,
-	[BNXT_ULP_CLASS_HID_4591] = 256,
-	[BNXT_ULP_CLASS_HID_1845] = 257,
-	[BNXT_ULP_CLASS_HID_1399] = 258,
-	[BNXT_ULP_CLASS_HID_0eed] = 259,
-	[BNXT_ULP_CLASS_HID_0a21] = 260,
-	[BNXT_ULP_CLASS_HID_38bd] = 261,
-	[BNXT_ULP_CLASS_HID_33f1] = 262,
-	[BNXT_ULP_CLASS_HID_2ec5] = 263,
-	[BNXT_ULP_CLASS_HID_2a19] = 264,
-	[BNXT_ULP_CLASS_HID_121d] = 265,
-	[BNXT_ULP_CLASS_HID_0d51] = 266,
-	[BNXT_ULP_CLASS_HID_08a5] = 267,
-	[BNXT_ULP_CLASS_HID_03f9] = 268,
-	[BNXT_ULP_CLASS_HID_4ed1] = 269,
-	[BNXT_ULP_CLASS_HID_4a25] = 270,
-	[BNXT_ULP_CLASS_HID_4579] = 271,
-	[BNXT_ULP_CLASS_HID_404d] = 272,
-	[BNXT_ULP_CLASS_HID_1209] = 273,
-	[BNXT_ULP_CLASS_HID_0d5d] = 274,
-	[BNXT_ULP_CLASS_HID_0891] = 275,
-	[BNXT_ULP_CLASS_HID_03e5] = 276,
-	[BNXT_ULP_CLASS_HID_3261] = 277,
-	[BNXT_ULP_CLASS_HID_2db5] = 278,
-	[BNXT_ULP_CLASS_HID_2889] = 279,
-	[BNXT_ULP_CLASS_HID_23dd] = 280,
-	[BNXT_ULP_CLASS_HID_0bc1] = 281,
-	[BNXT_ULP_CLASS_HID_0715] = 282,
-	[BNXT_ULP_CLASS_HID_0269] = 283,
-	[BNXT_ULP_CLASS_HID_5a69] = 284,
-	[BNXT_ULP_CLASS_HID_4895] = 285,
-	[BNXT_ULP_CLASS_HID_43e9] = 286,
-	[BNXT_ULP_CLASS_HID_3f3d] = 287,
-	[BNXT_ULP_CLASS_HID_3a71] = 288,
-	[BNXT_ULP_CLASS_HID_0bcd] = 289,
-	[BNXT_ULP_CLASS_HID_0701] = 290,
-	[BNXT_ULP_CLASS_HID_0255] = 291,
-	[BNXT_ULP_CLASS_HID_5a55] = 292,
-	[BNXT_ULP_CLASS_HID_2c25] = 293,
-	[BNXT_ULP_CLASS_HID_2779] = 294,
-	[BNXT_ULP_CLASS_HID_224d] = 295,
-	[BNXT_ULP_CLASS_HID_1d81] = 296,
-	[BNXT_ULP_CLASS_HID_0585] = 297,
-	[BNXT_ULP_CLASS_HID_00d9] = 298,
-	[BNXT_ULP_CLASS_HID_58d9] = 299,
-	[BNXT_ULP_CLASS_HID_542d] = 300,
-	[BNXT_ULP_CLASS_HID_4259] = 301,
-	[BNXT_ULP_CLASS_HID_3dad] = 302,
-	[BNXT_ULP_CLASS_HID_38e1] = 303,
-	[BNXT_ULP_CLASS_HID_3435] = 304,
-	[BNXT_ULP_CLASS_HID_05f1] = 305,
-	[BNXT_ULP_CLASS_HID_00c5] = 306,
-	[BNXT_ULP_CLASS_HID_58c5] = 307,
-	[BNXT_ULP_CLASS_HID_5419] = 308,
-	[BNXT_ULP_CLASS_HID_25e9] = 309,
-	[BNXT_ULP_CLASS_HID_213d] = 310,
-	[BNXT_ULP_CLASS_HID_1c71] = 311,
-	[BNXT_ULP_CLASS_HID_1745] = 312,
-	[BNXT_ULP_CLASS_HID_5c75] = 313,
-	[BNXT_ULP_CLASS_HID_5749] = 314,
-	[BNXT_ULP_CLASS_HID_529d] = 315,
-	[BNXT_ULP_CLASS_HID_4dd1] = 316,
-	[BNXT_ULP_CLASS_HID_3c1d] = 317,
-	[BNXT_ULP_CLASS_HID_3751] = 318,
-	[BNXT_ULP_CLASS_HID_32a5] = 319,
-	[BNXT_ULP_CLASS_HID_2df9] = 320,
-	[BNXT_ULP_CLASS_HID_4fe9] = 321,
-	[BNXT_ULP_CLASS_HID_4b3d] = 322,
-	[BNXT_ULP_CLASS_HID_4671] = 323,
-	[BNXT_ULP_CLASS_HID_4145] = 324,
-	[BNXT_ULP_CLASS_HID_1315] = 325,
-	[BNXT_ULP_CLASS_HID_0e69] = 326,
-	[BNXT_ULP_CLASS_HID_09bd] = 327,
-	[BNXT_ULP_CLASS_HID_04f1] = 328,
-	[BNXT_ULP_CLASS_HID_49a1] = 329,
-	[BNXT_ULP_CLASS_HID_44f5] = 330,
-	[BNXT_ULP_CLASS_HID_3fc9] = 331,
-	[BNXT_ULP_CLASS_HID_3b1d] = 332,
-	[BNXT_ULP_CLASS_HID_2949] = 333,
-	[BNXT_ULP_CLASS_HID_249d] = 334,
-	[BNXT_ULP_CLASS_HID_1fd1] = 335,
-	[BNXT_ULP_CLASS_HID_1b25] = 336,
-	[BNXT_ULP_CLASS_HID_49ad] = 337,
-	[BNXT_ULP_CLASS_HID_44e1] = 338,
-	[BNXT_ULP_CLASS_HID_4035] = 339,
-	[BNXT_ULP_CLASS_HID_3b09] = 340,
-	[BNXT_ULP_CLASS_HID_0cd9] = 341,
-	[BNXT_ULP_CLASS_HID_082d] = 342,
-	[BNXT_ULP_CLASS_HID_0361] = 343,
-	[BNXT_ULP_CLASS_HID_5b61] = 344,
-	[BNXT_ULP_CLASS_HID_4365] = 345,
-	[BNXT_ULP_CLASS_HID_3eb9] = 346,
-	[BNXT_ULP_CLASS_HID_398d] = 347,
-	[BNXT_ULP_CLASS_HID_34c1] = 348,
-	[BNXT_ULP_CLASS_HID_230d] = 349,
-	[BNXT_ULP_CLASS_HID_1e41] = 350,
-	[BNXT_ULP_CLASS_HID_1995] = 351,
-	[BNXT_ULP_CLASS_HID_14e9] = 352,
-	[BNXT_ULP_CLASS_HID_2559] = 353,
-	[BNXT_ULP_CLASS_HID_2b95] = 354,
-	[BNXT_ULP_CLASS_HID_4b8d] = 355,
-	[BNXT_ULP_CLASS_HID_45b1] = 356,
-	[BNXT_ULP_CLASS_HID_1825] = 357,
-	[BNXT_ULP_CLASS_HID_13f9] = 358,
-	[BNXT_ULP_CLASS_HID_0e8d] = 359,
-	[BNXT_ULP_CLASS_HID_0a41] = 360,
-	[BNXT_ULP_CLASS_HID_38dd] = 361,
-	[BNXT_ULP_CLASS_HID_3391] = 362,
-	[BNXT_ULP_CLASS_HID_2ea5] = 363,
-	[BNXT_ULP_CLASS_HID_2a79] = 364,
-	[BNXT_ULP_CLASS_HID_127d] = 365,
-	[BNXT_ULP_CLASS_HID_0d31] = 366,
-	[BNXT_ULP_CLASS_HID_08c5] = 367,
-	[BNXT_ULP_CLASS_HID_0399] = 368,
-	[BNXT_ULP_CLASS_HID_4eb1] = 369,
-	[BNXT_ULP_CLASS_HID_4a45] = 370,
-	[BNXT_ULP_CLASS_HID_4519] = 371,
-	[BNXT_ULP_CLASS_HID_402d] = 372,
-	[BNXT_ULP_CLASS_HID_1269] = 373,
-	[BNXT_ULP_CLASS_HID_0d3d] = 374,
-	[BNXT_ULP_CLASS_HID_08f1] = 375,
-	[BNXT_ULP_CLASS_HID_0385] = 376,
-	[BNXT_ULP_CLASS_HID_3201] = 377,
-	[BNXT_ULP_CLASS_HID_2dd5] = 378,
-	[BNXT_ULP_CLASS_HID_28e9] = 379,
-	[BNXT_ULP_CLASS_HID_23bd] = 380,
-	[BNXT_ULP_CLASS_HID_0ba1] = 381,
-	[BNXT_ULP_CLASS_HID_0775] = 382,
-	[BNXT_ULP_CLASS_HID_0209] = 383,
-	[BNXT_ULP_CLASS_HID_5a09] = 384,
-	[BNXT_ULP_CLASS_HID_48f5] = 385,
-	[BNXT_ULP_CLASS_HID_4389] = 386,
-	[BNXT_ULP_CLASS_HID_3f5d] = 387,
-	[BNXT_ULP_CLASS_HID_3a11] = 388,
-	[BNXT_ULP_CLASS_HID_0bad] = 389,
-	[BNXT_ULP_CLASS_HID_0761] = 390,
-	[BNXT_ULP_CLASS_HID_0235] = 391,
-	[BNXT_ULP_CLASS_HID_5a35] = 392,
-	[BNXT_ULP_CLASS_HID_2c45] = 393,
-	[BNXT_ULP_CLASS_HID_2719] = 394,
-	[BNXT_ULP_CLASS_HID_222d] = 395,
-	[BNXT_ULP_CLASS_HID_1de1] = 396,
-	[BNXT_ULP_CLASS_HID_05e5] = 397,
-	[BNXT_ULP_CLASS_HID_00b9] = 398,
-	[BNXT_ULP_CLASS_HID_58b9] = 399,
-	[BNXT_ULP_CLASS_HID_544d] = 400,
-	[BNXT_ULP_CLASS_HID_4239] = 401,
-	[BNXT_ULP_CLASS_HID_3dcd] = 402,
-	[BNXT_ULP_CLASS_HID_3881] = 403,
-	[BNXT_ULP_CLASS_HID_3455] = 404,
-	[BNXT_ULP_CLASS_HID_0591] = 405,
-	[BNXT_ULP_CLASS_HID_00a5] = 406,
-	[BNXT_ULP_CLASS_HID_58a5] = 407,
-	[BNXT_ULP_CLASS_HID_5479] = 408,
-	[BNXT_ULP_CLASS_HID_2589] = 409,
-	[BNXT_ULP_CLASS_HID_215d] = 410,
-	[BNXT_ULP_CLASS_HID_1c11] = 411,
-	[BNXT_ULP_CLASS_HID_1725] = 412,
-	[BNXT_ULP_CLASS_HID_5c15] = 413,
-	[BNXT_ULP_CLASS_HID_5729] = 414,
-	[BNXT_ULP_CLASS_HID_52fd] = 415,
-	[BNXT_ULP_CLASS_HID_4db1] = 416,
-	[BNXT_ULP_CLASS_HID_3c7d] = 417,
-	[BNXT_ULP_CLASS_HID_3731] = 418,
-	[BNXT_ULP_CLASS_HID_32c5] = 419,
-	[BNXT_ULP_CLASS_HID_2d99] = 420,
-	[BNXT_ULP_CLASS_HID_4f89] = 421,
-	[BNXT_ULP_CLASS_HID_4b5d] = 422,
-	[BNXT_ULP_CLASS_HID_4611] = 423,
-	[BNXT_ULP_CLASS_HID_4125] = 424,
-	[BNXT_ULP_CLASS_HID_1375] = 425,
-	[BNXT_ULP_CLASS_HID_0e09] = 426,
-	[BNXT_ULP_CLASS_HID_09dd] = 427,
-	[BNXT_ULP_CLASS_HID_0491] = 428,
-	[BNXT_ULP_CLASS_HID_49c1] = 429,
-	[BNXT_ULP_CLASS_HID_4495] = 430,
-	[BNXT_ULP_CLASS_HID_3fa9] = 431,
-	[BNXT_ULP_CLASS_HID_3b7d] = 432,
-	[BNXT_ULP_CLASS_HID_2929] = 433,
-	[BNXT_ULP_CLASS_HID_24fd] = 434,
-	[BNXT_ULP_CLASS_HID_1fb1] = 435,
-	[BNXT_ULP_CLASS_HID_1b45] = 436,
-	[BNXT_ULP_CLASS_HID_49cd] = 437,
-	[BNXT_ULP_CLASS_HID_4481] = 438,
-	[BNXT_ULP_CLASS_HID_4055] = 439,
-	[BNXT_ULP_CLASS_HID_3b69] = 440,
-	[BNXT_ULP_CLASS_HID_0cb9] = 441,
-	[BNXT_ULP_CLASS_HID_084d] = 442,
-	[BNXT_ULP_CLASS_HID_0301] = 443,
-	[BNXT_ULP_CLASS_HID_5b01] = 444,
-	[BNXT_ULP_CLASS_HID_4305] = 445,
-	[BNXT_ULP_CLASS_HID_3ed9] = 446,
-	[BNXT_ULP_CLASS_HID_39ed] = 447,
-	[BNXT_ULP_CLASS_HID_34a1] = 448,
-	[BNXT_ULP_CLASS_HID_236d] = 449,
-	[BNXT_ULP_CLASS_HID_1e21] = 450,
-	[BNXT_ULP_CLASS_HID_19f5] = 451,
-	[BNXT_ULP_CLASS_HID_1489] = 452,
-	[BNXT_ULP_CLASS_HID_2539] = 453,
-	[BNXT_ULP_CLASS_HID_2bf5] = 454,
-	[BNXT_ULP_CLASS_HID_4bed] = 455,
-	[BNXT_ULP_CLASS_HID_45d1] = 456,
-	[BNXT_ULP_CLASS_HID_b6af] = 457,
-	[BNXT_ULP_CLASS_HID_b1d3] = 458,
-	[BNXT_ULP_CLASS_HID_1c7d3] = 459,
-	[BNXT_ULP_CLASS_HID_1ccaf] = 460,
-	[BNXT_ULP_CLASS_HID_da33] = 461,
-	[BNXT_ULP_CLASS_HID_d567] = 462,
-	[BNXT_ULP_CLASS_HID_18eab] = 463,
-	[BNXT_ULP_CLASS_HID_19367] = 464,
-	[BNXT_ULP_CLASS_HID_a10b] = 465,
-	[BNXT_ULP_CLASS_HID_9c3f] = 466,
-	[BNXT_ULP_CLASS_HID_1b23f] = 467,
-	[BNXT_ULP_CLASS_HID_1b70b] = 468,
-	[BNXT_ULP_CLASS_HID_c49f] = 469,
-	[BNXT_ULP_CLASS_HID_bfc3] = 470,
-	[BNXT_ULP_CLASS_HID_1d5c3] = 471,
-	[BNXT_ULP_CLASS_HID_1da9f] = 472,
-	[BNXT_ULP_CLASS_HID_b063] = 473,
-	[BNXT_ULP_CLASS_HID_ab97] = 474,
-	[BNXT_ULP_CLASS_HID_1c197] = 475,
-	[BNXT_ULP_CLASS_HID_1c663] = 476,
-	[BNXT_ULP_CLASS_HID_d3f7] = 477,
-	[BNXT_ULP_CLASS_HID_cf3b] = 478,
-	[BNXT_ULP_CLASS_HID_1886f] = 479,
-	[BNXT_ULP_CLASS_HID_18d3b] = 480,
-	[BNXT_ULP_CLASS_HID_9acf] = 481,
-	[BNXT_ULP_CLASS_HID_95f3] = 482,
-	[BNXT_ULP_CLASS_HID_1abf3] = 483,
-	[BNXT_ULP_CLASS_HID_1b0cf] = 484,
-	[BNXT_ULP_CLASS_HID_be53] = 485,
-	[BNXT_ULP_CLASS_HID_b987] = 486,
-	[BNXT_ULP_CLASS_HID_1cf87] = 487,
-	[BNXT_ULP_CLASS_HID_1d453] = 488,
-	[BNXT_ULP_CLASS_HID_aa27] = 489,
-	[BNXT_ULP_CLASS_HID_a56b] = 490,
-	[BNXT_ULP_CLASS_HID_1bb6b] = 491,
-	[BNXT_ULP_CLASS_HID_1c027] = 492,
-	[BNXT_ULP_CLASS_HID_cdcb] = 493,
-	[BNXT_ULP_CLASS_HID_c8ff] = 494,
-	[BNXT_ULP_CLASS_HID_18223] = 495,
-	[BNXT_ULP_CLASS_HID_186ff] = 496,
-	[BNXT_ULP_CLASS_HID_9483] = 497,
-	[BNXT_ULP_CLASS_HID_8fb7] = 498,
-	[BNXT_ULP_CLASS_HID_1a5b7] = 499,
-	[BNXT_ULP_CLASS_HID_1aa83] = 500,
-	[BNXT_ULP_CLASS_HID_b817] = 501,
-	[BNXT_ULP_CLASS_HID_b35b] = 502,
-	[BNXT_ULP_CLASS_HID_1c95b] = 503,
-	[BNXT_ULP_CLASS_HID_1ce17] = 504,
-	[BNXT_ULP_CLASS_HID_a3fb] = 505,
-	[BNXT_ULP_CLASS_HID_9f2f] = 506,
-	[BNXT_ULP_CLASS_HID_1b52f] = 507,
-	[BNXT_ULP_CLASS_HID_1b9fb] = 508,
-	[BNXT_ULP_CLASS_HID_c78f] = 509,
-	[BNXT_ULP_CLASS_HID_c2b3] = 510,
-	[BNXT_ULP_CLASS_HID_1d8b3] = 511,
-	[BNXT_ULP_CLASS_HID_180b3] = 512,
-	[BNXT_ULP_CLASS_HID_8e47] = 513,
-	[BNXT_ULP_CLASS_HID_898b] = 514,
-	[BNXT_ULP_CLASS_HID_19f8b] = 515,
-	[BNXT_ULP_CLASS_HID_1a447] = 516,
-	[BNXT_ULP_CLASS_HID_b1eb] = 517,
-	[BNXT_ULP_CLASS_HID_ad1f] = 518,
-	[BNXT_ULP_CLASS_HID_1c31f] = 519,
-	[BNXT_ULP_CLASS_HID_1c7eb] = 520,
-	[BNXT_ULP_CLASS_HID_9137] = 521,
-	[BNXT_ULP_CLASS_HID_8c7b] = 522,
-	[BNXT_ULP_CLASS_HID_1a27b] = 523,
-	[BNXT_ULP_CLASS_HID_1a737] = 524,
-	[BNXT_ULP_CLASS_HID_b4db] = 525,
-	[BNXT_ULP_CLASS_HID_b00f] = 526,
-	[BNXT_ULP_CLASS_HID_1c60f] = 527,
-	[BNXT_ULP_CLASS_HID_1cadb] = 528,
-	[BNXT_ULP_CLASS_HID_8b0b] = 529,
-	[BNXT_ULP_CLASS_HID_863f] = 530,
-	[BNXT_ULP_CLASS_HID_19c3f] = 531,
-	[BNXT_ULP_CLASS_HID_1a10b] = 532,
-	[BNXT_ULP_CLASS_HID_ae9f] = 533,
-	[BNXT_ULP_CLASS_HID_a9c3] = 534,
-	[BNXT_ULP_CLASS_HID_1bfc3] = 535,
-	[BNXT_ULP_CLASS_HID_1c49f] = 536,
-	[BNXT_ULP_CLASS_HID_2563] = 537,
-	[BNXT_ULP_CLASS_HID_2baf] = 538,
-	[BNXT_ULP_CLASS_HID_26d3] = 539,
-	[BNXT_ULP_CLASS_HID_4f33] = 540,
-	[BNXT_ULP_CLASS_HID_4a67] = 541,
-	[BNXT_ULP_CLASS_HID_160b] = 542,
-	[BNXT_ULP_CLASS_HID_113f] = 543,
-	[BNXT_ULP_CLASS_HID_399f] = 544,
-	[BNXT_ULP_CLASS_HID_34c3] = 545,
-	[BNXT_ULP_CLASS_HID_2097] = 546,
-	[BNXT_ULP_CLASS_HID_48f7] = 547,
-	[BNXT_ULP_CLASS_HID_443b] = 548,
-	[BNXT_ULP_CLASS_HID_0fcf] = 549,
-	[BNXT_ULP_CLASS_HID_0af3] = 550,
-	[BNXT_ULP_CLASS_HID_3353] = 551,
-	[BNXT_ULP_CLASS_HID_2e87] = 552,
-	[BNXT_ULP_CLASS_HID_b68f] = 553,
-	[BNXT_ULP_CLASS_HID_b94f] = 554,
-	[BNXT_ULP_CLASS_HID_fc0f] = 555,
-	[BNXT_ULP_CLASS_HID_fecf] = 556,
-	[BNXT_ULP_CLASS_HID_b1f3] = 557,
-	[BNXT_ULP_CLASS_HID_b4b3] = 558,
-	[BNXT_ULP_CLASS_HID_f773] = 559,
-	[BNXT_ULP_CLASS_HID_fa33] = 560,
-	[BNXT_ULP_CLASS_HID_1c7f3] = 561,
-	[BNXT_ULP_CLASS_HID_1eab3] = 562,
-	[BNXT_ULP_CLASS_HID_1cd73] = 563,
-	[BNXT_ULP_CLASS_HID_1f033] = 564,
-	[BNXT_ULP_CLASS_HID_1cc8f] = 565,
-	[BNXT_ULP_CLASS_HID_1ef4f] = 566,
-	[BNXT_ULP_CLASS_HID_1d20f] = 567,
-	[BNXT_ULP_CLASS_HID_1f4cf] = 568,
-	[BNXT_ULP_CLASS_HID_da13] = 569,
-	[BNXT_ULP_CLASS_HID_a007] = 570,
-	[BNXT_ULP_CLASS_HID_c2c7] = 571,
-	[BNXT_ULP_CLASS_HID_e587] = 572,
-	[BNXT_ULP_CLASS_HID_d547] = 573,
-	[BNXT_ULP_CLASS_HID_f807] = 574,
-	[BNXT_ULP_CLASS_HID_dac7] = 575,
-	[BNXT_ULP_CLASS_HID_e0cb] = 576,
-	[BNXT_ULP_CLASS_HID_18e8b] = 577,
-	[BNXT_ULP_CLASS_HID_1b14b] = 578,
-	[BNXT_ULP_CLASS_HID_1d40b] = 579,
-	[BNXT_ULP_CLASS_HID_1f6cb] = 580,
-	[BNXT_ULP_CLASS_HID_19347] = 581,
-	[BNXT_ULP_CLASS_HID_1b607] = 582,
-	[BNXT_ULP_CLASS_HID_1d8c7] = 583,
-	[BNXT_ULP_CLASS_HID_1fb87] = 584,
-	[BNXT_ULP_CLASS_HID_a12b] = 585,
-	[BNXT_ULP_CLASS_HID_a3eb] = 586,
-	[BNXT_ULP_CLASS_HID_e6ab] = 587,
-	[BNXT_ULP_CLASS_HID_e96b] = 588,
-	[BNXT_ULP_CLASS_HID_9c1f] = 589,
-	[BNXT_ULP_CLASS_HID_bedf] = 590,
-	[BNXT_ULP_CLASS_HID_e19f] = 591,
-	[BNXT_ULP_CLASS_HID_e45f] = 592,
-	[BNXT_ULP_CLASS_HID_1b21f] = 593,
-	[BNXT_ULP_CLASS_HID_1b4df] = 594,
-	[BNXT_ULP_CLASS_HID_1f79f] = 595,
-	[BNXT_ULP_CLASS_HID_1fa5f] = 596,
-	[BNXT_ULP_CLASS_HID_1b72b] = 597,
-	[BNXT_ULP_CLASS_HID_1b9eb] = 598,
-	[BNXT_ULP_CLASS_HID_1fcab] = 599,
-	[BNXT_ULP_CLASS_HID_1ff6b] = 600,
-	[BNXT_ULP_CLASS_HID_c4bf] = 601,
-	[BNXT_ULP_CLASS_HID_e77f] = 602,
-	[BNXT_ULP_CLASS_HID_ca3f] = 603,
-	[BNXT_ULP_CLASS_HID_ecff] = 604,
-	[BNXT_ULP_CLASS_HID_bfe3] = 605,
-	[BNXT_ULP_CLASS_HID_e2a3] = 606,
-	[BNXT_ULP_CLASS_HID_c563] = 607,
-	[BNXT_ULP_CLASS_HID_e823] = 608,
-	[BNXT_ULP_CLASS_HID_1d5e3] = 609,
-	[BNXT_ULP_CLASS_HID_1f8a3] = 610,
-	[BNXT_ULP_CLASS_HID_1db63] = 611,
-	[BNXT_ULP_CLASS_HID_1e117] = 612,
-	[BNXT_ULP_CLASS_HID_1dabf] = 613,
-	[BNXT_ULP_CLASS_HID_1a0a3] = 614,
-	[BNXT_ULP_CLASS_HID_1c363] = 615,
-	[BNXT_ULP_CLASS_HID_1e623] = 616,
-	[BNXT_ULP_CLASS_HID_b043] = 617,
-	[BNXT_ULP_CLASS_HID_b303] = 618,
-	[BNXT_ULP_CLASS_HID_f5c3] = 619,
-	[BNXT_ULP_CLASS_HID_f883] = 620,
-	[BNXT_ULP_CLASS_HID_abb7] = 621,
-	[BNXT_ULP_CLASS_HID_ae77] = 622,
-	[BNXT_ULP_CLASS_HID_f137] = 623,
-	[BNXT_ULP_CLASS_HID_f3f7] = 624,
-	[BNXT_ULP_CLASS_HID_1c1b7] = 625,
-	[BNXT_ULP_CLASS_HID_1e477] = 626,
-	[BNXT_ULP_CLASS_HID_1c737] = 627,
-	[BNXT_ULP_CLASS_HID_1e9f7] = 628,
-	[BNXT_ULP_CLASS_HID_1c643] = 629,
-	[BNXT_ULP_CLASS_HID_1e903] = 630,
-	[BNXT_ULP_CLASS_HID_1cbc3] = 631,
-	[BNXT_ULP_CLASS_HID_1ee83] = 632,
-	[BNXT_ULP_CLASS_HID_d3d7] = 633,
-	[BNXT_ULP_CLASS_HID_f697] = 634,
-	[BNXT_ULP_CLASS_HID_d957] = 635,
-	[BNXT_ULP_CLASS_HID_fc17] = 636,
-	[BNXT_ULP_CLASS_HID_cf1b] = 637,
-	[BNXT_ULP_CLASS_HID_f1db] = 638,
-	[BNXT_ULP_CLASS_HID_d49b] = 639,
-	[BNXT_ULP_CLASS_HID_f75b] = 640,
-	[BNXT_ULP_CLASS_HID_1884f] = 641,
-	[BNXT_ULP_CLASS_HID_1ab0f] = 642,
-	[BNXT_ULP_CLASS_HID_1cdcf] = 643,
-	[BNXT_ULP_CLASS_HID_1f08f] = 644,
-	[BNXT_ULP_CLASS_HID_18d1b] = 645,
-	[BNXT_ULP_CLASS_HID_1afdb] = 646,
-	[BNXT_ULP_CLASS_HID_1d29b] = 647,
-	[BNXT_ULP_CLASS_HID_1f55b] = 648,
-	[BNXT_ULP_CLASS_HID_9aef] = 649,
-	[BNXT_ULP_CLASS_HID_bdaf] = 650,
-	[BNXT_ULP_CLASS_HID_e06f] = 651,
-	[BNXT_ULP_CLASS_HID_e32f] = 652,
-	[BNXT_ULP_CLASS_HID_95d3] = 653,
-	[BNXT_ULP_CLASS_HID_b893] = 654,
-	[BNXT_ULP_CLASS_HID_db53] = 655,
-	[BNXT_ULP_CLASS_HID_fe13] = 656,
-	[BNXT_ULP_CLASS_HID_1abd3] = 657,
-	[BNXT_ULP_CLASS_HID_1ae93] = 658,
-	[BNXT_ULP_CLASS_HID_1f153] = 659,
-	[BNXT_ULP_CLASS_HID_1f413] = 660,
-	[BNXT_ULP_CLASS_HID_1b0ef] = 661,
-	[BNXT_ULP_CLASS_HID_1b3af] = 662,
-	[BNXT_ULP_CLASS_HID_1f66f] = 663,
-	[BNXT_ULP_CLASS_HID_1f92f] = 664,
-	[BNXT_ULP_CLASS_HID_be73] = 665,
-	[BNXT_ULP_CLASS_HID_e133] = 666,
-	[BNXT_ULP_CLASS_HID_c3f3] = 667,
-	[BNXT_ULP_CLASS_HID_e6b3] = 668,
-	[BNXT_ULP_CLASS_HID_b9a7] = 669,
-	[BNXT_ULP_CLASS_HID_bc67] = 670,
-	[BNXT_ULP_CLASS_HID_ff27] = 671,
-	[BNXT_ULP_CLASS_HID_e1e7] = 672,
-	[BNXT_ULP_CLASS_HID_1cfa7] = 673,
-	[BNXT_ULP_CLASS_HID_1f267] = 674,
-	[BNXT_ULP_CLASS_HID_1d527] = 675,
-	[BNXT_ULP_CLASS_HID_1f7e7] = 676,
-	[BNXT_ULP_CLASS_HID_1d473] = 677,
-	[BNXT_ULP_CLASS_HID_1f733] = 678,
-	[BNXT_ULP_CLASS_HID_1d9f3] = 679,
-	[BNXT_ULP_CLASS_HID_1fcb3] = 680,
-	[BNXT_ULP_CLASS_HID_aa07] = 681,
-	[BNXT_ULP_CLASS_HID_acc7] = 682,
-	[BNXT_ULP_CLASS_HID_ef87] = 683,
-	[BNXT_ULP_CLASS_HID_f247] = 684,
-	[BNXT_ULP_CLASS_HID_a54b] = 685,
-	[BNXT_ULP_CLASS_HID_a80b] = 686,
-	[BNXT_ULP_CLASS_HID_eacb] = 687,
-	[BNXT_ULP_CLASS_HID_ed8b] = 688,
-	[BNXT_ULP_CLASS_HID_1bb4b] = 689,
-	[BNXT_ULP_CLASS_HID_1be0b] = 690,
-	[BNXT_ULP_CLASS_HID_1c0cb] = 691,
-	[BNXT_ULP_CLASS_HID_1e38b] = 692,
-	[BNXT_ULP_CLASS_HID_1c007] = 693,
-	[BNXT_ULP_CLASS_HID_1e2c7] = 694,
-	[BNXT_ULP_CLASS_HID_1c587] = 695,
-	[BNXT_ULP_CLASS_HID_1e847] = 696,
-	[BNXT_ULP_CLASS_HID_cdeb] = 697,
-	[BNXT_ULP_CLASS_HID_f0ab] = 698,
-	[BNXT_ULP_CLASS_HID_d36b] = 699,
-	[BNXT_ULP_CLASS_HID_f62b] = 700,
-	[BNXT_ULP_CLASS_HID_c8df] = 701,
-	[BNXT_ULP_CLASS_HID_eb9f] = 702,
-	[BNXT_ULP_CLASS_HID_ce5f] = 703,
-	[BNXT_ULP_CLASS_HID_f11f] = 704,
-	[BNXT_ULP_CLASS_HID_18203] = 705,
-	[BNXT_ULP_CLASS_HID_1a4c3] = 706,
-	[BNXT_ULP_CLASS_HID_1c783] = 707,
-	[BNXT_ULP_CLASS_HID_1ea43] = 708,
-	[BNXT_ULP_CLASS_HID_186df] = 709,
-	[BNXT_ULP_CLASS_HID_1a99f] = 710,
-	[BNXT_ULP_CLASS_HID_1cc5f] = 711,
-	[BNXT_ULP_CLASS_HID_1ef1f] = 712,
-	[BNXT_ULP_CLASS_HID_94a3] = 713,
-	[BNXT_ULP_CLASS_HID_b763] = 714,
-	[BNXT_ULP_CLASS_HID_da23] = 715,
-	[BNXT_ULP_CLASS_HID_fce3] = 716,
-	[BNXT_ULP_CLASS_HID_8f97] = 717,
-	[BNXT_ULP_CLASS_HID_b257] = 718,
-	[BNXT_ULP_CLASS_HID_d517] = 719,
-	[BNXT_ULP_CLASS_HID_f7d7] = 720,
-	[BNXT_ULP_CLASS_HID_1a597] = 721,
-	[BNXT_ULP_CLASS_HID_1a857] = 722,
-	[BNXT_ULP_CLASS_HID_1eb17] = 723,
-	[BNXT_ULP_CLASS_HID_1edd7] = 724,
-	[BNXT_ULP_CLASS_HID_1aaa3] = 725,
-	[BNXT_ULP_CLASS_HID_1ad63] = 726,
-	[BNXT_ULP_CLASS_HID_1f023] = 727,
-	[BNXT_ULP_CLASS_HID_1f2e3] = 728,
-	[BNXT_ULP_CLASS_HID_b837] = 729,
-	[BNXT_ULP_CLASS_HID_baf7] = 730,
-	[BNXT_ULP_CLASS_HID_fdb7] = 731,
-	[BNXT_ULP_CLASS_HID_e077] = 732,
-	[BNXT_ULP_CLASS_HID_b37b] = 733,
-	[BNXT_ULP_CLASS_HID_b63b] = 734,
-	[BNXT_ULP_CLASS_HID_f8fb] = 735,
-	[BNXT_ULP_CLASS_HID_fbbb] = 736,
-	[BNXT_ULP_CLASS_HID_1c97b] = 737,
-	[BNXT_ULP_CLASS_HID_1ec3b] = 738,
-	[BNXT_ULP_CLASS_HID_1cefb] = 739,
-	[BNXT_ULP_CLASS_HID_1f1bb] = 740,
-	[BNXT_ULP_CLASS_HID_1ce37] = 741,
-	[BNXT_ULP_CLASS_HID_1f0f7] = 742,
-	[BNXT_ULP_CLASS_HID_1d3b7] = 743,
-	[BNXT_ULP_CLASS_HID_1f677] = 744,
-	[BNXT_ULP_CLASS_HID_a3db] = 745,
-	[BNXT_ULP_CLASS_HID_a69b] = 746,
-	[BNXT_ULP_CLASS_HID_e95b] = 747,
-	[BNXT_ULP_CLASS_HID_ec1b] = 748,
-	[BNXT_ULP_CLASS_HID_9f0f] = 749,
-	[BNXT_ULP_CLASS_HID_a1cf] = 750,
-	[BNXT_ULP_CLASS_HID_e48f] = 751,
-	[BNXT_ULP_CLASS_HID_e74f] = 752,
-	[BNXT_ULP_CLASS_HID_1b50f] = 753,
-	[BNXT_ULP_CLASS_HID_1b7cf] = 754,
-	[BNXT_ULP_CLASS_HID_1fa8f] = 755,
-	[BNXT_ULP_CLASS_HID_1fd4f] = 756,
-	[BNXT_ULP_CLASS_HID_1b9db] = 757,
-	[BNXT_ULP_CLASS_HID_1bc9b] = 758,
-	[BNXT_ULP_CLASS_HID_1ff5b] = 759,
-	[BNXT_ULP_CLASS_HID_1e21b] = 760,
-	[BNXT_ULP_CLASS_HID_c7af] = 761,
-	[BNXT_ULP_CLASS_HID_ea6f] = 762,
-	[BNXT_ULP_CLASS_HID_cd2f] = 763,
-	[BNXT_ULP_CLASS_HID_efef] = 764,
-	[BNXT_ULP_CLASS_HID_c293] = 765,
-	[BNXT_ULP_CLASS_HID_e553] = 766,
-	[BNXT_ULP_CLASS_HID_c813] = 767,
-	[BNXT_ULP_CLASS_HID_ead3] = 768,
-	[BNXT_ULP_CLASS_HID_1d893] = 769,
-	[BNXT_ULP_CLASS_HID_1fb53] = 770,
-	[BNXT_ULP_CLASS_HID_1c147] = 771,
-	[BNXT_ULP_CLASS_HID_1e407] = 772,
-	[BNXT_ULP_CLASS_HID_18093] = 773,
-	[BNXT_ULP_CLASS_HID_1a353] = 774,
-	[BNXT_ULP_CLASS_HID_1c613] = 775,
-	[BNXT_ULP_CLASS_HID_1e8d3] = 776,
-	[BNXT_ULP_CLASS_HID_8e67] = 777,
-	[BNXT_ULP_CLASS_HID_b127] = 778,
-	[BNXT_ULP_CLASS_HID_d3e7] = 779,
-	[BNXT_ULP_CLASS_HID_f6a7] = 780,
-	[BNXT_ULP_CLASS_HID_89ab] = 781,
-	[BNXT_ULP_CLASS_HID_ac6b] = 782,
-	[BNXT_ULP_CLASS_HID_cf2b] = 783,
-	[BNXT_ULP_CLASS_HID_f1eb] = 784,
-	[BNXT_ULP_CLASS_HID_19fab] = 785,
-	[BNXT_ULP_CLASS_HID_1a26b] = 786,
-	[BNXT_ULP_CLASS_HID_1e52b] = 787,
-	[BNXT_ULP_CLASS_HID_1e7eb] = 788,
-	[BNXT_ULP_CLASS_HID_1a467] = 789,
-	[BNXT_ULP_CLASS_HID_1a727] = 790,
-	[BNXT_ULP_CLASS_HID_1e9e7] = 791,
-	[BNXT_ULP_CLASS_HID_1eca7] = 792,
-	[BNXT_ULP_CLASS_HID_b1cb] = 793,
-	[BNXT_ULP_CLASS_HID_b48b] = 794,
-	[BNXT_ULP_CLASS_HID_f74b] = 795,
-	[BNXT_ULP_CLASS_HID_fa0b] = 796,
-	[BNXT_ULP_CLASS_HID_ad3f] = 797,
-	[BNXT_ULP_CLASS_HID_afff] = 798,
-	[BNXT_ULP_CLASS_HID_f2bf] = 799,
-	[BNXT_ULP_CLASS_HID_f57f] = 800,
-	[BNXT_ULP_CLASS_HID_1c33f] = 801,
-	[BNXT_ULP_CLASS_HID_1e5ff] = 802,
-	[BNXT_ULP_CLASS_HID_1c8bf] = 803,
-	[BNXT_ULP_CLASS_HID_1eb7f] = 804,
-	[BNXT_ULP_CLASS_HID_1c7cb] = 805,
-	[BNXT_ULP_CLASS_HID_1ea8b] = 806,
-	[BNXT_ULP_CLASS_HID_1cd4b] = 807,
-	[BNXT_ULP_CLASS_HID_1f00b] = 808,
-	[BNXT_ULP_CLASS_HID_9117] = 809,
-	[BNXT_ULP_CLASS_HID_b3d7] = 810,
-	[BNXT_ULP_CLASS_HID_d697] = 811,
-	[BNXT_ULP_CLASS_HID_f957] = 812,
-	[BNXT_ULP_CLASS_HID_8c5b] = 813,
-	[BNXT_ULP_CLASS_HID_af1b] = 814,
-	[BNXT_ULP_CLASS_HID_d1db] = 815,
-	[BNXT_ULP_CLASS_HID_f49b] = 816,
-	[BNXT_ULP_CLASS_HID_1a25b] = 817,
-	[BNXT_ULP_CLASS_HID_1a51b] = 818,
-	[BNXT_ULP_CLASS_HID_1e7db] = 819,
-	[BNXT_ULP_CLASS_HID_1ea9b] = 820,
-	[BNXT_ULP_CLASS_HID_1a717] = 821,
-	[BNXT_ULP_CLASS_HID_1a9d7] = 822,
-	[BNXT_ULP_CLASS_HID_1ec97] = 823,
-	[BNXT_ULP_CLASS_HID_1ef57] = 824,
-	[BNXT_ULP_CLASS_HID_b4fb] = 825,
-	[BNXT_ULP_CLASS_HID_b7bb] = 826,
-	[BNXT_ULP_CLASS_HID_fa7b] = 827,
-	[BNXT_ULP_CLASS_HID_fd3b] = 828,
-	[BNXT_ULP_CLASS_HID_b02f] = 829,
-	[BNXT_ULP_CLASS_HID_b2ef] = 830,
-	[BNXT_ULP_CLASS_HID_f5af] = 831,
-	[BNXT_ULP_CLASS_HID_f86f] = 832,
-	[BNXT_ULP_CLASS_HID_1c62f] = 833,
-	[BNXT_ULP_CLASS_HID_1e8ef] = 834,
-	[BNXT_ULP_CLASS_HID_1cbaf] = 835,
-	[BNXT_ULP_CLASS_HID_1ee6f] = 836,
-	[BNXT_ULP_CLASS_HID_1cafb] = 837,
-	[BNXT_ULP_CLASS_HID_1edbb] = 838,
-	[BNXT_ULP_CLASS_HID_1d07b] = 839,
-	[BNXT_ULP_CLASS_HID_1f33b] = 840,
-	[BNXT_ULP_CLASS_HID_8b2b] = 841,
-	[BNXT_ULP_CLASS_HID_adeb] = 842,
-	[BNXT_ULP_CLASS_HID_d0ab] = 843,
-	[BNXT_ULP_CLASS_HID_f36b] = 844,
-	[BNXT_ULP_CLASS_HID_861f] = 845,
-	[BNXT_ULP_CLASS_HID_a8df] = 846,
-	[BNXT_ULP_CLASS_HID_cb9f] = 847,
-	[BNXT_ULP_CLASS_HID_ee5f] = 848,
-	[BNXT_ULP_CLASS_HID_19c1f] = 849,
-	[BNXT_ULP_CLASS_HID_1bedf] = 850,
-	[BNXT_ULP_CLASS_HID_1e19f] = 851,
-	[BNXT_ULP_CLASS_HID_1e45f] = 852,
-	[BNXT_ULP_CLASS_HID_1a12b] = 853,
-	[BNXT_ULP_CLASS_HID_1a3eb] = 854,
-	[BNXT_ULP_CLASS_HID_1e6ab] = 855,
-	[BNXT_ULP_CLASS_HID_1e96b] = 856,
-	[BNXT_ULP_CLASS_HID_aebf] = 857,
-	[BNXT_ULP_CLASS_HID_b17f] = 858,
-	[BNXT_ULP_CLASS_HID_f43f] = 859,
-	[BNXT_ULP_CLASS_HID_f6ff] = 860,
-	[BNXT_ULP_CLASS_HID_a9e3] = 861,
-	[BNXT_ULP_CLASS_HID_aca3] = 862,
-	[BNXT_ULP_CLASS_HID_ef63] = 863,
-	[BNXT_ULP_CLASS_HID_f223] = 864,
-	[BNXT_ULP_CLASS_HID_1bfe3] = 865,
-	[BNXT_ULP_CLASS_HID_1e2a3] = 866,
-	[BNXT_ULP_CLASS_HID_1c563] = 867,
-	[BNXT_ULP_CLASS_HID_1e823] = 868,
-	[BNXT_ULP_CLASS_HID_1c4bf] = 869,
-	[BNXT_ULP_CLASS_HID_1e77f] = 870,
-	[BNXT_ULP_CLASS_HID_1ca3f] = 871,
-	[BNXT_ULP_CLASS_HID_1ecff] = 872,
-	[BNXT_ULP_CLASS_HID_2543] = 873,
-	[BNXT_ULP_CLASS_HID_2b8f] = 874,
-	[BNXT_ULP_CLASS_HID_26f3] = 875,
-	[BNXT_ULP_CLASS_HID_4f13] = 876,
-	[BNXT_ULP_CLASS_HID_4a47] = 877,
-	[BNXT_ULP_CLASS_HID_162b] = 878,
-	[BNXT_ULP_CLASS_HID_111f] = 879,
-	[BNXT_ULP_CLASS_HID_39bf] = 880,
-	[BNXT_ULP_CLASS_HID_34e3] = 881,
-	[BNXT_ULP_CLASS_HID_20b7] = 882,
-	[BNXT_ULP_CLASS_HID_48d7] = 883,
-	[BNXT_ULP_CLASS_HID_441b] = 884,
-	[BNXT_ULP_CLASS_HID_0fef] = 885,
-	[BNXT_ULP_CLASS_HID_0ad3] = 886,
-	[BNXT_ULP_CLASS_HID_3373] = 887,
-	[BNXT_ULP_CLASS_HID_2ea7] = 888,
-	[BNXT_ULP_CLASS_HID_b6ef] = 889,
-	[BNXT_ULP_CLASS_HID_b92f] = 890,
-	[BNXT_ULP_CLASS_HID_fc6f] = 891,
-	[BNXT_ULP_CLASS_HID_feaf] = 892,
-	[BNXT_ULP_CLASS_HID_b193] = 893,
-	[BNXT_ULP_CLASS_HID_b4d3] = 894,
-	[BNXT_ULP_CLASS_HID_f713] = 895,
-	[BNXT_ULP_CLASS_HID_fa53] = 896,
-	[BNXT_ULP_CLASS_HID_1c793] = 897,
-	[BNXT_ULP_CLASS_HID_1ead3] = 898,
-	[BNXT_ULP_CLASS_HID_1cd13] = 899,
-	[BNXT_ULP_CLASS_HID_1f053] = 900,
-	[BNXT_ULP_CLASS_HID_1ccef] = 901,
-	[BNXT_ULP_CLASS_HID_1ef2f] = 902,
-	[BNXT_ULP_CLASS_HID_1d26f] = 903,
-	[BNXT_ULP_CLASS_HID_1f4af] = 904,
-	[BNXT_ULP_CLASS_HID_da73] = 905,
-	[BNXT_ULP_CLASS_HID_a067] = 906,
-	[BNXT_ULP_CLASS_HID_c2a7] = 907,
-	[BNXT_ULP_CLASS_HID_e5e7] = 908,
-	[BNXT_ULP_CLASS_HID_d527] = 909,
-	[BNXT_ULP_CLASS_HID_f867] = 910,
-	[BNXT_ULP_CLASS_HID_daa7] = 911,
-	[BNXT_ULP_CLASS_HID_e0ab] = 912,
-	[BNXT_ULP_CLASS_HID_18eeb] = 913,
-	[BNXT_ULP_CLASS_HID_1b12b] = 914,
-	[BNXT_ULP_CLASS_HID_1d46b] = 915,
-	[BNXT_ULP_CLASS_HID_1f6ab] = 916,
-	[BNXT_ULP_CLASS_HID_19327] = 917,
-	[BNXT_ULP_CLASS_HID_1b667] = 918,
-	[BNXT_ULP_CLASS_HID_1d8a7] = 919,
-	[BNXT_ULP_CLASS_HID_1fbe7] = 920,
-	[BNXT_ULP_CLASS_HID_a14b] = 921,
-	[BNXT_ULP_CLASS_HID_a38b] = 922,
-	[BNXT_ULP_CLASS_HID_e6cb] = 923,
-	[BNXT_ULP_CLASS_HID_e90b] = 924,
-	[BNXT_ULP_CLASS_HID_9c7f] = 925,
-	[BNXT_ULP_CLASS_HID_bebf] = 926,
-	[BNXT_ULP_CLASS_HID_e1ff] = 927,
-	[BNXT_ULP_CLASS_HID_e43f] = 928,
-	[BNXT_ULP_CLASS_HID_1b27f] = 929,
-	[BNXT_ULP_CLASS_HID_1b4bf] = 930,
-	[BNXT_ULP_CLASS_HID_1f7ff] = 931,
-	[BNXT_ULP_CLASS_HID_1fa3f] = 932,
-	[BNXT_ULP_CLASS_HID_1b74b] = 933,
-	[BNXT_ULP_CLASS_HID_1b98b] = 934,
-	[BNXT_ULP_CLASS_HID_1fccb] = 935,
-	[BNXT_ULP_CLASS_HID_1ff0b] = 936,
-	[BNXT_ULP_CLASS_HID_c4df] = 937,
-	[BNXT_ULP_CLASS_HID_e71f] = 938,
-	[BNXT_ULP_CLASS_HID_ca5f] = 939,
-	[BNXT_ULP_CLASS_HID_ec9f] = 940,
-	[BNXT_ULP_CLASS_HID_bf83] = 941,
-	[BNXT_ULP_CLASS_HID_e2c3] = 942,
-	[BNXT_ULP_CLASS_HID_c503] = 943,
-	[BNXT_ULP_CLASS_HID_e843] = 944,
-	[BNXT_ULP_CLASS_HID_1d583] = 945,
-	[BNXT_ULP_CLASS_HID_1f8c3] = 946,
-	[BNXT_ULP_CLASS_HID_1db03] = 947,
-	[BNXT_ULP_CLASS_HID_1e177] = 948,
-	[BNXT_ULP_CLASS_HID_1dadf] = 949,
-	[BNXT_ULP_CLASS_HID_1a0c3] = 950,
-	[BNXT_ULP_CLASS_HID_1c303] = 951,
-	[BNXT_ULP_CLASS_HID_1e643] = 952,
-	[BNXT_ULP_CLASS_HID_b023] = 953,
-	[BNXT_ULP_CLASS_HID_b363] = 954,
-	[BNXT_ULP_CLASS_HID_f5a3] = 955,
-	[BNXT_ULP_CLASS_HID_f8e3] = 956,
-	[BNXT_ULP_CLASS_HID_abd7] = 957,
-	[BNXT_ULP_CLASS_HID_ae17] = 958,
-	[BNXT_ULP_CLASS_HID_f157] = 959,
-	[BNXT_ULP_CLASS_HID_f397] = 960,
-	[BNXT_ULP_CLASS_HID_1c1d7] = 961,
-	[BNXT_ULP_CLASS_HID_1e417] = 962,
-	[BNXT_ULP_CLASS_HID_1c757] = 963,
-	[BNXT_ULP_CLASS_HID_1e997] = 964,
-	[BNXT_ULP_CLASS_HID_1c623] = 965,
-	[BNXT_ULP_CLASS_HID_1e963] = 966,
-	[BNXT_ULP_CLASS_HID_1cba3] = 967,
-	[BNXT_ULP_CLASS_HID_1eee3] = 968,
-	[BNXT_ULP_CLASS_HID_d3b7] = 969,
-	[BNXT_ULP_CLASS_HID_f6f7] = 970,
-	[BNXT_ULP_CLASS_HID_d937] = 971,
-	[BNXT_ULP_CLASS_HID_fc77] = 972,
-	[BNXT_ULP_CLASS_HID_cf7b] = 973,
-	[BNXT_ULP_CLASS_HID_f1bb] = 974,
-	[BNXT_ULP_CLASS_HID_d4fb] = 975,
-	[BNXT_ULP_CLASS_HID_f73b] = 976,
-	[BNXT_ULP_CLASS_HID_1882f] = 977,
-	[BNXT_ULP_CLASS_HID_1ab6f] = 978,
-	[BNXT_ULP_CLASS_HID_1cdaf] = 979,
-	[BNXT_ULP_CLASS_HID_1f0ef] = 980,
-	[BNXT_ULP_CLASS_HID_18d7b] = 981,
-	[BNXT_ULP_CLASS_HID_1afbb] = 982,
-	[BNXT_ULP_CLASS_HID_1d2fb] = 983,
-	[BNXT_ULP_CLASS_HID_1f53b] = 984,
-	[BNXT_ULP_CLASS_HID_9a8f] = 985,
-	[BNXT_ULP_CLASS_HID_bdcf] = 986,
-	[BNXT_ULP_CLASS_HID_e00f] = 987,
-	[BNXT_ULP_CLASS_HID_e34f] = 988,
-	[BNXT_ULP_CLASS_HID_95b3] = 989,
-	[BNXT_ULP_CLASS_HID_b8f3] = 990,
-	[BNXT_ULP_CLASS_HID_db33] = 991,
-	[BNXT_ULP_CLASS_HID_fe73] = 992,
-	[BNXT_ULP_CLASS_HID_1abb3] = 993,
-	[BNXT_ULP_CLASS_HID_1aef3] = 994,
-	[BNXT_ULP_CLASS_HID_1f133] = 995,
-	[BNXT_ULP_CLASS_HID_1f473] = 996,
-	[BNXT_ULP_CLASS_HID_1b08f] = 997,
-	[BNXT_ULP_CLASS_HID_1b3cf] = 998,
-	[BNXT_ULP_CLASS_HID_1f60f] = 999,
-	[BNXT_ULP_CLASS_HID_1f94f] = 1000,
-	[BNXT_ULP_CLASS_HID_be13] = 1001,
-	[BNXT_ULP_CLASS_HID_e153] = 1002,
-	[BNXT_ULP_CLASS_HID_c393] = 1003,
-	[BNXT_ULP_CLASS_HID_e6d3] = 1004,
-	[BNXT_ULP_CLASS_HID_b9c7] = 1005,
-	[BNXT_ULP_CLASS_HID_bc07] = 1006,
-	[BNXT_ULP_CLASS_HID_ff47] = 1007,
-	[BNXT_ULP_CLASS_HID_e187] = 1008,
-	[BNXT_ULP_CLASS_HID_1cfc7] = 1009,
-	[BNXT_ULP_CLASS_HID_1f207] = 1010,
-	[BNXT_ULP_CLASS_HID_1d547] = 1011,
-	[BNXT_ULP_CLASS_HID_1f787] = 1012,
-	[BNXT_ULP_CLASS_HID_1d413] = 1013,
-	[BNXT_ULP_CLASS_HID_1f753] = 1014,
-	[BNXT_ULP_CLASS_HID_1d993] = 1015,
-	[BNXT_ULP_CLASS_HID_1fcd3] = 1016,
-	[BNXT_ULP_CLASS_HID_aa67] = 1017,
-	[BNXT_ULP_CLASS_HID_aca7] = 1018,
-	[BNXT_ULP_CLASS_HID_efe7] = 1019,
-	[BNXT_ULP_CLASS_HID_f227] = 1020,
-	[BNXT_ULP_CLASS_HID_a52b] = 1021,
-	[BNXT_ULP_CLASS_HID_a86b] = 1022,
-	[BNXT_ULP_CLASS_HID_eaab] = 1023,
-	[BNXT_ULP_CLASS_HID_edeb] = 1024,
-	[BNXT_ULP_CLASS_HID_1bb2b] = 1025,
-	[BNXT_ULP_CLASS_HID_1be6b] = 1026,
-	[BNXT_ULP_CLASS_HID_1c0ab] = 1027,
-	[BNXT_ULP_CLASS_HID_1e3eb] = 1028,
-	[BNXT_ULP_CLASS_HID_1c067] = 1029,
-	[BNXT_ULP_CLASS_HID_1e2a7] = 1030,
-	[BNXT_ULP_CLASS_HID_1c5e7] = 1031,
-	[BNXT_ULP_CLASS_HID_1e827] = 1032,
-	[BNXT_ULP_CLASS_HID_cd8b] = 1033,
-	[BNXT_ULP_CLASS_HID_f0cb] = 1034,
-	[BNXT_ULP_CLASS_HID_d30b] = 1035,
-	[BNXT_ULP_CLASS_HID_f64b] = 1036,
-	[BNXT_ULP_CLASS_HID_c8bf] = 1037,
-	[BNXT_ULP_CLASS_HID_ebff] = 1038,
-	[BNXT_ULP_CLASS_HID_ce3f] = 1039,
-	[BNXT_ULP_CLASS_HID_f17f] = 1040,
-	[BNXT_ULP_CLASS_HID_18263] = 1041,
-	[BNXT_ULP_CLASS_HID_1a4a3] = 1042,
-	[BNXT_ULP_CLASS_HID_1c7e3] = 1043,
-	[BNXT_ULP_CLASS_HID_1ea23] = 1044,
-	[BNXT_ULP_CLASS_HID_186bf] = 1045,
-	[BNXT_ULP_CLASS_HID_1a9ff] = 1046,
-	[BNXT_ULP_CLASS_HID_1cc3f] = 1047,
-	[BNXT_ULP_CLASS_HID_1ef7f] = 1048,
-	[BNXT_ULP_CLASS_HID_94c3] = 1049,
-	[BNXT_ULP_CLASS_HID_b703] = 1050,
-	[BNXT_ULP_CLASS_HID_da43] = 1051,
-	[BNXT_ULP_CLASS_HID_fc83] = 1052,
-	[BNXT_ULP_CLASS_HID_8ff7] = 1053,
-	[BNXT_ULP_CLASS_HID_b237] = 1054,
-	[BNXT_ULP_CLASS_HID_d577] = 1055,
-	[BNXT_ULP_CLASS_HID_f7b7] = 1056,
-	[BNXT_ULP_CLASS_HID_1a5f7] = 1057,
-	[BNXT_ULP_CLASS_HID_1a837] = 1058,
-	[BNXT_ULP_CLASS_HID_1eb77] = 1059,
-	[BNXT_ULP_CLASS_HID_1edb7] = 1060,
-	[BNXT_ULP_CLASS_HID_1aac3] = 1061,
-	[BNXT_ULP_CLASS_HID_1ad03] = 1062,
-	[BNXT_ULP_CLASS_HID_1f043] = 1063,
-	[BNXT_ULP_CLASS_HID_1f283] = 1064,
-	[BNXT_ULP_CLASS_HID_b857] = 1065,
-	[BNXT_ULP_CLASS_HID_ba97] = 1066,
-	[BNXT_ULP_CLASS_HID_fdd7] = 1067,
-	[BNXT_ULP_CLASS_HID_e017] = 1068,
-	[BNXT_ULP_CLASS_HID_b31b] = 1069,
-	[BNXT_ULP_CLASS_HID_b65b] = 1070,
-	[BNXT_ULP_CLASS_HID_f89b] = 1071,
-	[BNXT_ULP_CLASS_HID_fbdb] = 1072,
-	[BNXT_ULP_CLASS_HID_1c91b] = 1073,
-	[BNXT_ULP_CLASS_HID_1ec5b] = 1074,
-	[BNXT_ULP_CLASS_HID_1ce9b] = 1075,
-	[BNXT_ULP_CLASS_HID_1f1db] = 1076,
-	[BNXT_ULP_CLASS_HID_1ce57] = 1077,
-	[BNXT_ULP_CLASS_HID_1f097] = 1078,
-	[BNXT_ULP_CLASS_HID_1d3d7] = 1079,
-	[BNXT_ULP_CLASS_HID_1f617] = 1080,
-	[BNXT_ULP_CLASS_HID_a3bb] = 1081,
-	[BNXT_ULP_CLASS_HID_a6fb] = 1082,
-	[BNXT_ULP_CLASS_HID_e93b] = 1083,
-	[BNXT_ULP_CLASS_HID_ec7b] = 1084,
-	[BNXT_ULP_CLASS_HID_9f6f] = 1085,
-	[BNXT_ULP_CLASS_HID_a1af] = 1086,
-	[BNXT_ULP_CLASS_HID_e4ef] = 1087,
-	[BNXT_ULP_CLASS_HID_e72f] = 1088,
-	[BNXT_ULP_CLASS_HID_1b56f] = 1089,
-	[BNXT_ULP_CLASS_HID_1b7af] = 1090,
-	[BNXT_ULP_CLASS_HID_1faef] = 1091,
-	[BNXT_ULP_CLASS_HID_1fd2f] = 1092,
-	[BNXT_ULP_CLASS_HID_1b9bb] = 1093,
-	[BNXT_ULP_CLASS_HID_1bcfb] = 1094,
-	[BNXT_ULP_CLASS_HID_1ff3b] = 1095,
-	[BNXT_ULP_CLASS_HID_1e27b] = 1096,
-	[BNXT_ULP_CLASS_HID_c7cf] = 1097,
-	[BNXT_ULP_CLASS_HID_ea0f] = 1098,
-	[BNXT_ULP_CLASS_HID_cd4f] = 1099,
-	[BNXT_ULP_CLASS_HID_ef8f] = 1100,
-	[BNXT_ULP_CLASS_HID_c2f3] = 1101,
-	[BNXT_ULP_CLASS_HID_e533] = 1102,
-	[BNXT_ULP_CLASS_HID_c873] = 1103,
-	[BNXT_ULP_CLASS_HID_eab3] = 1104,
-	[BNXT_ULP_CLASS_HID_1d8f3] = 1105,
-	[BNXT_ULP_CLASS_HID_1fb33] = 1106,
-	[BNXT_ULP_CLASS_HID_1c127] = 1107,
-	[BNXT_ULP_CLASS_HID_1e467] = 1108,
-	[BNXT_ULP_CLASS_HID_180f3] = 1109,
-	[BNXT_ULP_CLASS_HID_1a333] = 1110,
-	[BNXT_ULP_CLASS_HID_1c673] = 1111,
-	[BNXT_ULP_CLASS_HID_1e8b3] = 1112,
-	[BNXT_ULP_CLASS_HID_8e07] = 1113,
-	[BNXT_ULP_CLASS_HID_b147] = 1114,
-	[BNXT_ULP_CLASS_HID_d387] = 1115,
-	[BNXT_ULP_CLASS_HID_f6c7] = 1116,
-	[BNXT_ULP_CLASS_HID_89cb] = 1117,
-	[BNXT_ULP_CLASS_HID_ac0b] = 1118,
-	[BNXT_ULP_CLASS_HID_cf4b] = 1119,
-	[BNXT_ULP_CLASS_HID_f18b] = 1120,
-	[BNXT_ULP_CLASS_HID_19fcb] = 1121,
-	[BNXT_ULP_CLASS_HID_1a20b] = 1122,
-	[BNXT_ULP_CLASS_HID_1e54b] = 1123,
-	[BNXT_ULP_CLASS_HID_1e78b] = 1124,
-	[BNXT_ULP_CLASS_HID_1a407] = 1125,
-	[BNXT_ULP_CLASS_HID_1a747] = 1126,
-	[BNXT_ULP_CLASS_HID_1e987] = 1127,
-	[BNXT_ULP_CLASS_HID_1ecc7] = 1128,
-	[BNXT_ULP_CLASS_HID_b1ab] = 1129,
-	[BNXT_ULP_CLASS_HID_b4eb] = 1130,
-	[BNXT_ULP_CLASS_HID_f72b] = 1131,
-	[BNXT_ULP_CLASS_HID_fa6b] = 1132,
-	[BNXT_ULP_CLASS_HID_ad5f] = 1133,
-	[BNXT_ULP_CLASS_HID_af9f] = 1134,
-	[BNXT_ULP_CLASS_HID_f2df] = 1135,
-	[BNXT_ULP_CLASS_HID_f51f] = 1136,
-	[BNXT_ULP_CLASS_HID_1c35f] = 1137,
-	[BNXT_ULP_CLASS_HID_1e59f] = 1138,
-	[BNXT_ULP_CLASS_HID_1c8df] = 1139,
-	[BNXT_ULP_CLASS_HID_1eb1f] = 1140,
-	[BNXT_ULP_CLASS_HID_1c7ab] = 1141,
-	[BNXT_ULP_CLASS_HID_1eaeb] = 1142,
-	[BNXT_ULP_CLASS_HID_1cd2b] = 1143,
-	[BNXT_ULP_CLASS_HID_1f06b] = 1144,
-	[BNXT_ULP_CLASS_HID_9177] = 1145,
-	[BNXT_ULP_CLASS_HID_b3b7] = 1146,
-	[BNXT_ULP_CLASS_HID_d6f7] = 1147,
-	[BNXT_ULP_CLASS_HID_f937] = 1148,
-	[BNXT_ULP_CLASS_HID_8c3b] = 1149,
-	[BNXT_ULP_CLASS_HID_af7b] = 1150,
-	[BNXT_ULP_CLASS_HID_d1bb] = 1151,
-	[BNXT_ULP_CLASS_HID_f4fb] = 1152,
-	[BNXT_ULP_CLASS_HID_1a23b] = 1153,
-	[BNXT_ULP_CLASS_HID_1a57b] = 1154,
-	[BNXT_ULP_CLASS_HID_1e7bb] = 1155,
-	[BNXT_ULP_CLASS_HID_1eafb] = 1156,
-	[BNXT_ULP_CLASS_HID_1a777] = 1157,
-	[BNXT_ULP_CLASS_HID_1a9b7] = 1158,
-	[BNXT_ULP_CLASS_HID_1ecf7] = 1159,
-	[BNXT_ULP_CLASS_HID_1ef37] = 1160,
-	[BNXT_ULP_CLASS_HID_b49b] = 1161,
-	[BNXT_ULP_CLASS_HID_b7db] = 1162,
-	[BNXT_ULP_CLASS_HID_fa1b] = 1163,
-	[BNXT_ULP_CLASS_HID_fd5b] = 1164,
-	[BNXT_ULP_CLASS_HID_b04f] = 1165,
-	[BNXT_ULP_CLASS_HID_b28f] = 1166,
-	[BNXT_ULP_CLASS_HID_f5cf] = 1167,
-	[BNXT_ULP_CLASS_HID_f80f] = 1168,
-	[BNXT_ULP_CLASS_HID_1c64f] = 1169,
-	[BNXT_ULP_CLASS_HID_1e88f] = 1170,
-	[BNXT_ULP_CLASS_HID_1cbcf] = 1171,
-	[BNXT_ULP_CLASS_HID_1ee0f] = 1172,
-	[BNXT_ULP_CLASS_HID_1ca9b] = 1173,
-	[BNXT_ULP_CLASS_HID_1eddb] = 1174,
-	[BNXT_ULP_CLASS_HID_1d01b] = 1175,
-	[BNXT_ULP_CLASS_HID_1f35b] = 1176,
-	[BNXT_ULP_CLASS_HID_8b4b] = 1177,
-	[BNXT_ULP_CLASS_HID_ad8b] = 1178,
-	[BNXT_ULP_CLASS_HID_d0cb] = 1179,
-	[BNXT_ULP_CLASS_HID_f30b] = 1180,
-	[BNXT_ULP_CLASS_HID_867f] = 1181,
-	[BNXT_ULP_CLASS_HID_a8bf] = 1182,
-	[BNXT_ULP_CLASS_HID_cbff] = 1183,
-	[BNXT_ULP_CLASS_HID_ee3f] = 1184,
-	[BNXT_ULP_CLASS_HID_19c7f] = 1185,
-	[BNXT_ULP_CLASS_HID_1bebf] = 1186,
-	[BNXT_ULP_CLASS_HID_1e1ff] = 1187,
-	[BNXT_ULP_CLASS_HID_1e43f] = 1188,
-	[BNXT_ULP_CLASS_HID_1a14b] = 1189,
-	[BNXT_ULP_CLASS_HID_1a38b] = 1190,
-	[BNXT_ULP_CLASS_HID_1e6cb] = 1191,
-	[BNXT_ULP_CLASS_HID_1e90b] = 1192,
-	[BNXT_ULP_CLASS_HID_aedf] = 1193,
-	[BNXT_ULP_CLASS_HID_b11f] = 1194,
-	[BNXT_ULP_CLASS_HID_f45f] = 1195,
-	[BNXT_ULP_CLASS_HID_f69f] = 1196,
-	[BNXT_ULP_CLASS_HID_a983] = 1197,
-	[BNXT_ULP_CLASS_HID_acc3] = 1198,
-	[BNXT_ULP_CLASS_HID_ef03] = 1199,
-	[BNXT_ULP_CLASS_HID_f243] = 1200,
-	[BNXT_ULP_CLASS_HID_1bf83] = 1201,
-	[BNXT_ULP_CLASS_HID_1e2c3] = 1202,
-	[BNXT_ULP_CLASS_HID_1c503] = 1203,
-	[BNXT_ULP_CLASS_HID_1e843] = 1204,
-	[BNXT_ULP_CLASS_HID_1c4df] = 1205,
-	[BNXT_ULP_CLASS_HID_1e71f] = 1206,
-	[BNXT_ULP_CLASS_HID_1ca5f] = 1207,
-	[BNXT_ULP_CLASS_HID_1ec9f] = 1208,
-	[BNXT_ULP_CLASS_HID_2523] = 1209,
-	[BNXT_ULP_CLASS_HID_2bef] = 1210,
-	[BNXT_ULP_CLASS_HID_2693] = 1211,
-	[BNXT_ULP_CLASS_HID_4f73] = 1212,
-	[BNXT_ULP_CLASS_HID_4a27] = 1213,
-	[BNXT_ULP_CLASS_HID_164b] = 1214,
-	[BNXT_ULP_CLASS_HID_117f] = 1215,
-	[BNXT_ULP_CLASS_HID_39df] = 1216,
-	[BNXT_ULP_CLASS_HID_3483] = 1217,
-	[BNXT_ULP_CLASS_HID_20d7] = 1218,
-	[BNXT_ULP_CLASS_HID_48b7] = 1219,
-	[BNXT_ULP_CLASS_HID_447b] = 1220,
-	[BNXT_ULP_CLASS_HID_0f8f] = 1221,
-	[BNXT_ULP_CLASS_HID_0ab3] = 1222,
-	[BNXT_ULP_CLASS_HID_3313] = 1223,
-	[BNXT_ULP_CLASS_HID_2ec7] = 1224,
-	[BNXT_ULP_CLASS_HID_257b7] = 1225,
-	[BNXT_ULP_CLASS_HID_24467] = 1226,
-	[BNXT_ULP_CLASS_HID_23fbb] = 1227,
-	[BNXT_ULP_CLASS_HID_252cb] = 1228,
-	[BNXT_ULP_CLASS_HID_21e7f] = 1229,
-	[BNXT_ULP_CLASS_HID_20b2f] = 1230,
-	[BNXT_ULP_CLASS_HID_20663] = 1231,
-	[BNXT_ULP_CLASS_HID_219b3] = 1232,
-	[BNXT_ULP_CLASS_HID_24213] = 1233,
-	[BNXT_ULP_CLASS_HID_22ec3] = 1234,
-	[BNXT_ULP_CLASS_HID_22a17] = 1235,
-	[BNXT_ULP_CLASS_HID_23d27] = 1236,
-	[BNXT_ULP_CLASS_HID_208db] = 1237,
-	[BNXT_ULP_CLASS_HID_25277] = 1238,
-	[BNXT_ULP_CLASS_HID_24d8b] = 1239,
-	[BNXT_ULP_CLASS_HID_203ef] = 1240,
-	[BNXT_ULP_CLASS_HID_2517b] = 1241,
-	[BNXT_ULP_CLASS_HID_23e2b] = 1242,
-	[BNXT_ULP_CLASS_HID_2397f] = 1243,
-	[BNXT_ULP_CLASS_HID_24c8f] = 1244,
-	[BNXT_ULP_CLASS_HID_21823] = 1245,
-	[BNXT_ULP_CLASS_HID_20513] = 1246,
-	[BNXT_ULP_CLASS_HID_20027] = 1247,
-	[BNXT_ULP_CLASS_HID_21377] = 1248,
-	[BNXT_ULP_CLASS_HID_23bd7] = 1249,
-	[BNXT_ULP_CLASS_HID_22887] = 1250,
-	[BNXT_ULP_CLASS_HID_223db] = 1251,
-	[BNXT_ULP_CLASS_HID_236eb] = 1252,
-	[BNXT_ULP_CLASS_HID_2029f] = 1253,
-	[BNXT_ULP_CLASS_HID_24c3b] = 1254,
-	[BNXT_ULP_CLASS_HID_2474f] = 1255,
-	[BNXT_ULP_CLASS_HID_25a9f] = 1256,
-	[BNXT_ULP_CLASS_HID_24b3f] = 1257,
-	[BNXT_ULP_CLASS_HID_237ef] = 1258,
-	[BNXT_ULP_CLASS_HID_23323] = 1259,
-	[BNXT_ULP_CLASS_HID_24673] = 1260,
-	[BNXT_ULP_CLASS_HID_211e7] = 1261,
-	[BNXT_ULP_CLASS_HID_25b83] = 1262,
-	[BNXT_ULP_CLASS_HID_256d7] = 1263,
-	[BNXT_ULP_CLASS_HID_20d3b] = 1264,
-	[BNXT_ULP_CLASS_HID_2359b] = 1265,
-	[BNXT_ULP_CLASS_HID_2224b] = 1266,
-	[BNXT_ULP_CLASS_HID_21d9f] = 1267,
-	[BNXT_ULP_CLASS_HID_230af] = 1268,
-	[BNXT_ULP_CLASS_HID_2590f] = 1269,
-	[BNXT_ULP_CLASS_HID_245ff] = 1270,
-	[BNXT_ULP_CLASS_HID_24133] = 1271,
-	[BNXT_ULP_CLASS_HID_25443] = 1272,
-	[BNXT_ULP_CLASS_HID_244e3] = 1273,
-	[BNXT_ULP_CLASS_HID_231d3] = 1274,
-	[BNXT_ULP_CLASS_HID_22ce7] = 1275,
-	[BNXT_ULP_CLASS_HID_24037] = 1276,
-	[BNXT_ULP_CLASS_HID_20bab] = 1277,
-	[BNXT_ULP_CLASS_HID_25547] = 1278,
-	[BNXT_ULP_CLASS_HID_2509b] = 1279,
-	[BNXT_ULP_CLASS_HID_206ff] = 1280,
-	[BNXT_ULP_CLASS_HID_22f5f] = 1281,
-	[BNXT_ULP_CLASS_HID_21c0f] = 1282,
-	[BNXT_ULP_CLASS_HID_21743] = 1283,
-	[BNXT_ULP_CLASS_HID_22a93] = 1284,
-	[BNXT_ULP_CLASS_HID_252f3] = 1285,
-	[BNXT_ULP_CLASS_HID_23fa3] = 1286,
-	[BNXT_ULP_CLASS_HID_23af7] = 1287,
-	[BNXT_ULP_CLASS_HID_24e07] = 1288,
-	[BNXT_ULP_CLASS_HID_2322f] = 1289,
-	[BNXT_ULP_CLASS_HID_21f1f] = 1290,
-	[BNXT_ULP_CLASS_HID_21a53] = 1291,
-	[BNXT_ULP_CLASS_HID_22d63] = 1292,
-	[BNXT_ULP_CLASS_HID_255c3] = 1293,
-	[BNXT_ULP_CLASS_HID_242b3] = 1294,
-	[BNXT_ULP_CLASS_HID_23dc7] = 1295,
-	[BNXT_ULP_CLASS_HID_25117] = 1296,
-	[BNXT_ULP_CLASS_HID_22c13] = 1297,
-	[BNXT_ULP_CLASS_HID_218c3] = 1298,
-	[BNXT_ULP_CLASS_HID_21417] = 1299,
-	[BNXT_ULP_CLASS_HID_22727] = 1300,
-	[BNXT_ULP_CLASS_HID_24f87] = 1301,
-	[BNXT_ULP_CLASS_HID_23c77] = 1302,
-	[BNXT_ULP_CLASS_HID_2378b] = 1303,
-	[BNXT_ULP_CLASS_HID_24adb] = 1304,
-	[BNXT_ULP_CLASS_HID_257b] = 1305,
-	[BNXT_ULP_CLASS_HID_2bb7] = 1306,
-	[BNXT_ULP_CLASS_HID_1867] = 1307,
-	[BNXT_ULP_CLASS_HID_4f2b] = 1308,
-	[BNXT_ULP_CLASS_HID_3c1b] = 1309,
-	[BNXT_ULP_CLASS_HID_1613] = 1310,
-	[BNXT_ULP_CLASS_HID_02c3] = 1311,
-	[BNXT_ULP_CLASS_HID_3987] = 1312,
-	[BNXT_ULP_CLASS_HID_2677] = 1313,
-	[BNXT_ULP_CLASS_HID_122b] = 1314,
-	[BNXT_ULP_CLASS_HID_48ef] = 1315,
-	[BNXT_ULP_CLASS_HID_35df] = 1316,
-	[BNXT_ULP_CLASS_HID_0fd7] = 1317,
-	[BNXT_ULP_CLASS_HID_5973] = 1318,
-	[BNXT_ULP_CLASS_HID_334b] = 1319,
-	[BNXT_ULP_CLASS_HID_203b] = 1320,
-	[BNXT_ULP_CLASS_HID_25797] = 1321,
-	[BNXT_ULP_CLASS_HID_285eb] = 1322,
-	[BNXT_ULP_CLASS_HID_310eb] = 1323,
-	[BNXT_ULP_CLASS_HID_39beb] = 1324,
-	[BNXT_ULP_CLASS_HID_24447] = 1325,
-	[BNXT_ULP_CLASS_HID_2cf47] = 1326,
-	[BNXT_ULP_CLASS_HID_35a47] = 1327,
-	[BNXT_ULP_CLASS_HID_3889b] = 1328,
-	[BNXT_ULP_CLASS_HID_23f9b] = 1329,
-	[BNXT_ULP_CLASS_HID_2ca9b] = 1330,
-	[BNXT_ULP_CLASS_HID_3559b] = 1331,
-	[BNXT_ULP_CLASS_HID_383ef] = 1332,
-	[BNXT_ULP_CLASS_HID_252eb] = 1333,
-	[BNXT_ULP_CLASS_HID_2813f] = 1334,
-	[BNXT_ULP_CLASS_HID_30c3f] = 1335,
-	[BNXT_ULP_CLASS_HID_3973f] = 1336,
-	[BNXT_ULP_CLASS_HID_21e5f] = 1337,
-	[BNXT_ULP_CLASS_HID_2a95f] = 1338,
-	[BNXT_ULP_CLASS_HID_3345f] = 1339,
-	[BNXT_ULP_CLASS_HID_3bf5f] = 1340,
-	[BNXT_ULP_CLASS_HID_20b0f] = 1341,
-	[BNXT_ULP_CLASS_HID_2960f] = 1342,
-	[BNXT_ULP_CLASS_HID_3210f] = 1343,
-	[BNXT_ULP_CLASS_HID_3ac0f] = 1344,
-	[BNXT_ULP_CLASS_HID_20643] = 1345,
-	[BNXT_ULP_CLASS_HID_29143] = 1346,
-	[BNXT_ULP_CLASS_HID_31c43] = 1347,
-	[BNXT_ULP_CLASS_HID_3a743] = 1348,
-	[BNXT_ULP_CLASS_HID_21993] = 1349,
-	[BNXT_ULP_CLASS_HID_2a493] = 1350,
-	[BNXT_ULP_CLASS_HID_32f93] = 1351,
-	[BNXT_ULP_CLASS_HID_3ba93] = 1352,
-	[BNXT_ULP_CLASS_HID_24233] = 1353,
-	[BNXT_ULP_CLASS_HID_2cd33] = 1354,
-	[BNXT_ULP_CLASS_HID_35833] = 1355,
-	[BNXT_ULP_CLASS_HID_38607] = 1356,
-	[BNXT_ULP_CLASS_HID_22ee3] = 1357,
-	[BNXT_ULP_CLASS_HID_2b9e3] = 1358,
-	[BNXT_ULP_CLASS_HID_344e3] = 1359,
-	[BNXT_ULP_CLASS_HID_3cfe3] = 1360,
-	[BNXT_ULP_CLASS_HID_22a37] = 1361,
-	[BNXT_ULP_CLASS_HID_2b537] = 1362,
-	[BNXT_ULP_CLASS_HID_34037] = 1363,
-	[BNXT_ULP_CLASS_HID_3cb37] = 1364,
-	[BNXT_ULP_CLASS_HID_23d07] = 1365,
-	[BNXT_ULP_CLASS_HID_2c807] = 1366,
-	[BNXT_ULP_CLASS_HID_35307] = 1367,
-	[BNXT_ULP_CLASS_HID_3815b] = 1368,
-	[BNXT_ULP_CLASS_HID_208fb] = 1369,
-	[BNXT_ULP_CLASS_HID_293fb] = 1370,
-	[BNXT_ULP_CLASS_HID_31efb] = 1371,
-	[BNXT_ULP_CLASS_HID_3a9fb] = 1372,
-	[BNXT_ULP_CLASS_HID_25257] = 1373,
-	[BNXT_ULP_CLASS_HID_280ab] = 1374,
-	[BNXT_ULP_CLASS_HID_30bab] = 1375,
-	[BNXT_ULP_CLASS_HID_396ab] = 1376,
-	[BNXT_ULP_CLASS_HID_24dab] = 1377,
-	[BNXT_ULP_CLASS_HID_2d8ab] = 1378,
-	[BNXT_ULP_CLASS_HID_306ff] = 1379,
-	[BNXT_ULP_CLASS_HID_391ff] = 1380,
-	[BNXT_ULP_CLASS_HID_203cf] = 1381,
-	[BNXT_ULP_CLASS_HID_28ecf] = 1382,
-	[BNXT_ULP_CLASS_HID_319cf] = 1383,
-	[BNXT_ULP_CLASS_HID_3a4cf] = 1384,
-	[BNXT_ULP_CLASS_HID_2515b] = 1385,
-	[BNXT_ULP_CLASS_HID_2dc5b] = 1386,
-	[BNXT_ULP_CLASS_HID_30aaf] = 1387,
-	[BNXT_ULP_CLASS_HID_395af] = 1388,
-	[BNXT_ULP_CLASS_HID_23e0b] = 1389,
-	[BNXT_ULP_CLASS_HID_2c90b] = 1390,
-	[BNXT_ULP_CLASS_HID_3540b] = 1391,
-	[BNXT_ULP_CLASS_HID_3825f] = 1392,
-	[BNXT_ULP_CLASS_HID_2395f] = 1393,
-	[BNXT_ULP_CLASS_HID_2c45f] = 1394,
-	[BNXT_ULP_CLASS_HID_34f5f] = 1395,
-	[BNXT_ULP_CLASS_HID_3da5f] = 1396,
-	[BNXT_ULP_CLASS_HID_24caf] = 1397,
-	[BNXT_ULP_CLASS_HID_2d7af] = 1398,
-	[BNXT_ULP_CLASS_HID_305e3] = 1399,
-	[BNXT_ULP_CLASS_HID_390e3] = 1400,
-	[BNXT_ULP_CLASS_HID_21803] = 1401,
-	[BNXT_ULP_CLASS_HID_2a303] = 1402,
-	[BNXT_ULP_CLASS_HID_32e03] = 1403,
-	[BNXT_ULP_CLASS_HID_3b903] = 1404,
-	[BNXT_ULP_CLASS_HID_20533] = 1405,
-	[BNXT_ULP_CLASS_HID_29033] = 1406,
-	[BNXT_ULP_CLASS_HID_31b33] = 1407,
-	[BNXT_ULP_CLASS_HID_3a633] = 1408,
-	[BNXT_ULP_CLASS_HID_20007] = 1409,
-	[BNXT_ULP_CLASS_HID_28b07] = 1410,
-	[BNXT_ULP_CLASS_HID_31607] = 1411,
-	[BNXT_ULP_CLASS_HID_3a107] = 1412,
-	[BNXT_ULP_CLASS_HID_21357] = 1413,
-	[BNXT_ULP_CLASS_HID_29e57] = 1414,
-	[BNXT_ULP_CLASS_HID_32957] = 1415,
-	[BNXT_ULP_CLASS_HID_3b457] = 1416,
-	[BNXT_ULP_CLASS_HID_23bf7] = 1417,
-	[BNXT_ULP_CLASS_HID_2c6f7] = 1418,
-	[BNXT_ULP_CLASS_HID_351f7] = 1419,
-	[BNXT_ULP_CLASS_HID_3dcf7] = 1420,
-	[BNXT_ULP_CLASS_HID_228a7] = 1421,
-	[BNXT_ULP_CLASS_HID_2b3a7] = 1422,
-	[BNXT_ULP_CLASS_HID_33ea7] = 1423,
-	[BNXT_ULP_CLASS_HID_3c9a7] = 1424,
-	[BNXT_ULP_CLASS_HID_223fb] = 1425,
-	[BNXT_ULP_CLASS_HID_2aefb] = 1426,
-	[BNXT_ULP_CLASS_HID_339fb] = 1427,
-	[BNXT_ULP_CLASS_HID_3c4fb] = 1428,
-	[BNXT_ULP_CLASS_HID_236cb] = 1429,
-	[BNXT_ULP_CLASS_HID_2c1cb] = 1430,
-	[BNXT_ULP_CLASS_HID_34ccb] = 1431,
-	[BNXT_ULP_CLASS_HID_3d7cb] = 1432,
-	[BNXT_ULP_CLASS_HID_202bf] = 1433,
-	[BNXT_ULP_CLASS_HID_28dbf] = 1434,
-	[BNXT_ULP_CLASS_HID_318bf] = 1435,
-	[BNXT_ULP_CLASS_HID_3a3bf] = 1436,
-	[BNXT_ULP_CLASS_HID_24c1b] = 1437,
-	[BNXT_ULP_CLASS_HID_2d71b] = 1438,
-	[BNXT_ULP_CLASS_HID_3056f] = 1439,
-	[BNXT_ULP_CLASS_HID_3906f] = 1440,
-	[BNXT_ULP_CLASS_HID_2476f] = 1441,
-	[BNXT_ULP_CLASS_HID_2d26f] = 1442,
-	[BNXT_ULP_CLASS_HID_300a3] = 1443,
-	[BNXT_ULP_CLASS_HID_38ba3] = 1444,
-	[BNXT_ULP_CLASS_HID_25abf] = 1445,
-	[BNXT_ULP_CLASS_HID_288f3] = 1446,
-	[BNXT_ULP_CLASS_HID_313f3] = 1447,
-	[BNXT_ULP_CLASS_HID_39ef3] = 1448,
-	[BNXT_ULP_CLASS_HID_24b1f] = 1449,
-	[BNXT_ULP_CLASS_HID_2d61f] = 1450,
-	[BNXT_ULP_CLASS_HID_30453] = 1451,
-	[BNXT_ULP_CLASS_HID_38f53] = 1452,
-	[BNXT_ULP_CLASS_HID_237cf] = 1453,
-	[BNXT_ULP_CLASS_HID_2c2cf] = 1454,
-	[BNXT_ULP_CLASS_HID_34dcf] = 1455,
-	[BNXT_ULP_CLASS_HID_3d8cf] = 1456,
-	[BNXT_ULP_CLASS_HID_23303] = 1457,
-	[BNXT_ULP_CLASS_HID_2be03] = 1458,
-	[BNXT_ULP_CLASS_HID_34903] = 1459,
-	[BNXT_ULP_CLASS_HID_3d403] = 1460,
-	[BNXT_ULP_CLASS_HID_24653] = 1461,
-	[BNXT_ULP_CLASS_HID_2d153] = 1462,
-	[BNXT_ULP_CLASS_HID_35c53] = 1463,
-	[BNXT_ULP_CLASS_HID_38aa7] = 1464,
-	[BNXT_ULP_CLASS_HID_211c7] = 1465,
-	[BNXT_ULP_CLASS_HID_29cc7] = 1466,
-	[BNXT_ULP_CLASS_HID_327c7] = 1467,
-	[BNXT_ULP_CLASS_HID_3b2c7] = 1468,
-	[BNXT_ULP_CLASS_HID_25ba3] = 1469,
-	[BNXT_ULP_CLASS_HID_289f7] = 1470,
-	[BNXT_ULP_CLASS_HID_314f7] = 1471,
-	[BNXT_ULP_CLASS_HID_39ff7] = 1472,
-	[BNXT_ULP_CLASS_HID_256f7] = 1473,
-	[BNXT_ULP_CLASS_HID_284cb] = 1474,
-	[BNXT_ULP_CLASS_HID_30fcb] = 1475,
-	[BNXT_ULP_CLASS_HID_39acb] = 1476,
-	[BNXT_ULP_CLASS_HID_20d1b] = 1477,
-	[BNXT_ULP_CLASS_HID_2981b] = 1478,
-	[BNXT_ULP_CLASS_HID_3231b] = 1479,
-	[BNXT_ULP_CLASS_HID_3ae1b] = 1480,
-	[BNXT_ULP_CLASS_HID_235bb] = 1481,
-	[BNXT_ULP_CLASS_HID_2c0bb] = 1482,
-	[BNXT_ULP_CLASS_HID_34bbb] = 1483,
-	[BNXT_ULP_CLASS_HID_3d6bb] = 1484,
-	[BNXT_ULP_CLASS_HID_2226b] = 1485,
-	[BNXT_ULP_CLASS_HID_2ad6b] = 1486,
-	[BNXT_ULP_CLASS_HID_3386b] = 1487,
-	[BNXT_ULP_CLASS_HID_3c36b] = 1488,
-	[BNXT_ULP_CLASS_HID_21dbf] = 1489,
-	[BNXT_ULP_CLASS_HID_2a8bf] = 1490,
-	[BNXT_ULP_CLASS_HID_333bf] = 1491,
-	[BNXT_ULP_CLASS_HID_3bebf] = 1492,
-	[BNXT_ULP_CLASS_HID_2308f] = 1493,
-	[BNXT_ULP_CLASS_HID_2bb8f] = 1494,
-	[BNXT_ULP_CLASS_HID_3468f] = 1495,
-	[BNXT_ULP_CLASS_HID_3d18f] = 1496,
-	[BNXT_ULP_CLASS_HID_2592f] = 1497,
-	[BNXT_ULP_CLASS_HID_28763] = 1498,
-	[BNXT_ULP_CLASS_HID_31263] = 1499,
-	[BNXT_ULP_CLASS_HID_39d63] = 1500,
-	[BNXT_ULP_CLASS_HID_245df] = 1501,
-	[BNXT_ULP_CLASS_HID_2d0df] = 1502,
-	[BNXT_ULP_CLASS_HID_35bdf] = 1503,
-	[BNXT_ULP_CLASS_HID_38a13] = 1504,
-	[BNXT_ULP_CLASS_HID_24113] = 1505,
-	[BNXT_ULP_CLASS_HID_2cc13] = 1506,
-	[BNXT_ULP_CLASS_HID_35713] = 1507,
-	[BNXT_ULP_CLASS_HID_38567] = 1508,
-	[BNXT_ULP_CLASS_HID_25463] = 1509,
-	[BNXT_ULP_CLASS_HID_282b7] = 1510,
-	[BNXT_ULP_CLASS_HID_30db7] = 1511,
-	[BNXT_ULP_CLASS_HID_398b7] = 1512,
-	[BNXT_ULP_CLASS_HID_244c3] = 1513,
-	[BNXT_ULP_CLASS_HID_2cfc3] = 1514,
-	[BNXT_ULP_CLASS_HID_35ac3] = 1515,
-	[BNXT_ULP_CLASS_HID_38917] = 1516,
-	[BNXT_ULP_CLASS_HID_231f3] = 1517,
-	[BNXT_ULP_CLASS_HID_2bcf3] = 1518,
-	[BNXT_ULP_CLASS_HID_347f3] = 1519,
-	[BNXT_ULP_CLASS_HID_3d2f3] = 1520,
-	[BNXT_ULP_CLASS_HID_22cc7] = 1521,
-	[BNXT_ULP_CLASS_HID_2b7c7] = 1522,
-	[BNXT_ULP_CLASS_HID_342c7] = 1523,
-	[BNXT_ULP_CLASS_HID_3cdc7] = 1524,
-	[BNXT_ULP_CLASS_HID_24017] = 1525,
-	[BNXT_ULP_CLASS_HID_2cb17] = 1526,
-	[BNXT_ULP_CLASS_HID_35617] = 1527,
-	[BNXT_ULP_CLASS_HID_3846b] = 1528,
-	[BNXT_ULP_CLASS_HID_20b8b] = 1529,
-	[BNXT_ULP_CLASS_HID_2968b] = 1530,
-	[BNXT_ULP_CLASS_HID_3218b] = 1531,
-	[BNXT_ULP_CLASS_HID_3ac8b] = 1532,
-	[BNXT_ULP_CLASS_HID_25567] = 1533,
-	[BNXT_ULP_CLASS_HID_283bb] = 1534,
-	[BNXT_ULP_CLASS_HID_30ebb] = 1535,
-	[BNXT_ULP_CLASS_HID_399bb] = 1536,
-	[BNXT_ULP_CLASS_HID_250bb] = 1537,
-	[BNXT_ULP_CLASS_HID_2dbbb] = 1538,
-	[BNXT_ULP_CLASS_HID_3098f] = 1539,
-	[BNXT_ULP_CLASS_HID_3948f] = 1540,
-	[BNXT_ULP_CLASS_HID_206df] = 1541,
-	[BNXT_ULP_CLASS_HID_291df] = 1542,
-	[BNXT_ULP_CLASS_HID_31cdf] = 1543,
-	[BNXT_ULP_CLASS_HID_3a7df] = 1544,
-	[BNXT_ULP_CLASS_HID_22f7f] = 1545,
-	[BNXT_ULP_CLASS_HID_2ba7f] = 1546,
-	[BNXT_ULP_CLASS_HID_3457f] = 1547,
-	[BNXT_ULP_CLASS_HID_3d07f] = 1548,
-	[BNXT_ULP_CLASS_HID_21c2f] = 1549,
-	[BNXT_ULP_CLASS_HID_2a72f] = 1550,
-	[BNXT_ULP_CLASS_HID_3322f] = 1551,
-	[BNXT_ULP_CLASS_HID_3bd2f] = 1552,
-	[BNXT_ULP_CLASS_HID_21763] = 1553,
-	[BNXT_ULP_CLASS_HID_2a263] = 1554,
-	[BNXT_ULP_CLASS_HID_32d63] = 1555,
-	[BNXT_ULP_CLASS_HID_3b863] = 1556,
-	[BNXT_ULP_CLASS_HID_22ab3] = 1557,
-	[BNXT_ULP_CLASS_HID_2b5b3] = 1558,
-	[BNXT_ULP_CLASS_HID_340b3] = 1559,
-	[BNXT_ULP_CLASS_HID_3cbb3] = 1560,
-	[BNXT_ULP_CLASS_HID_252d3] = 1561,
-	[BNXT_ULP_CLASS_HID_28127] = 1562,
-	[BNXT_ULP_CLASS_HID_30c27] = 1563,
-	[BNXT_ULP_CLASS_HID_39727] = 1564,
-	[BNXT_ULP_CLASS_HID_23f83] = 1565,
-	[BNXT_ULP_CLASS_HID_2ca83] = 1566,
-	[BNXT_ULP_CLASS_HID_35583] = 1567,
-	[BNXT_ULP_CLASS_HID_383d7] = 1568,
-	[BNXT_ULP_CLASS_HID_23ad7] = 1569,
-	[BNXT_ULP_CLASS_HID_2c5d7] = 1570,
-	[BNXT_ULP_CLASS_HID_350d7] = 1571,
-	[BNXT_ULP_CLASS_HID_3dbd7] = 1572,
-	[BNXT_ULP_CLASS_HID_24e27] = 1573,
-	[BNXT_ULP_CLASS_HID_2d927] = 1574,
-	[BNXT_ULP_CLASS_HID_3077b] = 1575,
-	[BNXT_ULP_CLASS_HID_3927b] = 1576,
-	[BNXT_ULP_CLASS_HID_2320f] = 1577,
-	[BNXT_ULP_CLASS_HID_2bd0f] = 1578,
-	[BNXT_ULP_CLASS_HID_3480f] = 1579,
-	[BNXT_ULP_CLASS_HID_3d30f] = 1580,
-	[BNXT_ULP_CLASS_HID_21f3f] = 1581,
-	[BNXT_ULP_CLASS_HID_2aa3f] = 1582,
-	[BNXT_ULP_CLASS_HID_3353f] = 1583,
-	[BNXT_ULP_CLASS_HID_3c03f] = 1584,
-	[BNXT_ULP_CLASS_HID_21a73] = 1585,
-	[BNXT_ULP_CLASS_HID_2a573] = 1586,
-	[BNXT_ULP_CLASS_HID_33073] = 1587,
-	[BNXT_ULP_CLASS_HID_3bb73] = 1588,
-	[BNXT_ULP_CLASS_HID_22d43] = 1589,
-	[BNXT_ULP_CLASS_HID_2b843] = 1590,
-	[BNXT_ULP_CLASS_HID_34343] = 1591,
-	[BNXT_ULP_CLASS_HID_3ce43] = 1592,
-	[BNXT_ULP_CLASS_HID_255e3] = 1593,
-	[BNXT_ULP_CLASS_HID_28437] = 1594,
-	[BNXT_ULP_CLASS_HID_30f37] = 1595,
-	[BNXT_ULP_CLASS_HID_39a37] = 1596,
-	[BNXT_ULP_CLASS_HID_24293] = 1597,
-	[BNXT_ULP_CLASS_HID_2cd93] = 1598,
-	[BNXT_ULP_CLASS_HID_35893] = 1599,
-	[BNXT_ULP_CLASS_HID_386e7] = 1600,
-	[BNXT_ULP_CLASS_HID_23de7] = 1601,
-	[BNXT_ULP_CLASS_HID_2c8e7] = 1602,
-	[BNXT_ULP_CLASS_HID_353e7] = 1603,
-	[BNXT_ULP_CLASS_HID_3823b] = 1604,
-	[BNXT_ULP_CLASS_HID_25137] = 1605,
-	[BNXT_ULP_CLASS_HID_2dc37] = 1606,
-	[BNXT_ULP_CLASS_HID_30a0b] = 1607,
-	[BNXT_ULP_CLASS_HID_3950b] = 1608,
-	[BNXT_ULP_CLASS_HID_22c33] = 1609,
-	[BNXT_ULP_CLASS_HID_2b733] = 1610,
-	[BNXT_ULP_CLASS_HID_34233] = 1611,
-	[BNXT_ULP_CLASS_HID_3cd33] = 1612,
-	[BNXT_ULP_CLASS_HID_218e3] = 1613,
-	[BNXT_ULP_CLASS_HID_2a3e3] = 1614,
-	[BNXT_ULP_CLASS_HID_32ee3] = 1615,
-	[BNXT_ULP_CLASS_HID_3b9e3] = 1616,
-	[BNXT_ULP_CLASS_HID_21437] = 1617,
-	[BNXT_ULP_CLASS_HID_29f37] = 1618,
-	[BNXT_ULP_CLASS_HID_32a37] = 1619,
-	[BNXT_ULP_CLASS_HID_3b537] = 1620,
-	[BNXT_ULP_CLASS_HID_22707] = 1621,
-	[BNXT_ULP_CLASS_HID_2b207] = 1622,
-	[BNXT_ULP_CLASS_HID_33d07] = 1623,
-	[BNXT_ULP_CLASS_HID_3c807] = 1624,
-	[BNXT_ULP_CLASS_HID_24fa7] = 1625,
-	[BNXT_ULP_CLASS_HID_2daa7] = 1626,
-	[BNXT_ULP_CLASS_HID_308fb] = 1627,
-	[BNXT_ULP_CLASS_HID_393fb] = 1628,
-	[BNXT_ULP_CLASS_HID_23c57] = 1629,
-	[BNXT_ULP_CLASS_HID_2c757] = 1630,
-	[BNXT_ULP_CLASS_HID_35257] = 1631,
-	[BNXT_ULP_CLASS_HID_380ab] = 1632,
-	[BNXT_ULP_CLASS_HID_237ab] = 1633,
-	[BNXT_ULP_CLASS_HID_2c2ab] = 1634,
-	[BNXT_ULP_CLASS_HID_34dab] = 1635,
-	[BNXT_ULP_CLASS_HID_3d8ab] = 1636,
-	[BNXT_ULP_CLASS_HID_24afb] = 1637,
-	[BNXT_ULP_CLASS_HID_2d5fb] = 1638,
-	[BNXT_ULP_CLASS_HID_303cf] = 1639,
-	[BNXT_ULP_CLASS_HID_38ecf] = 1640,
-	[BNXT_ULP_CLASS_HID_255b] = 1641,
-	[BNXT_ULP_CLASS_HID_2b97] = 1642,
-	[BNXT_ULP_CLASS_HID_1847] = 1643,
-	[BNXT_ULP_CLASS_HID_4f0b] = 1644,
-	[BNXT_ULP_CLASS_HID_3c3b] = 1645,
-	[BNXT_ULP_CLASS_HID_1633] = 1646,
-	[BNXT_ULP_CLASS_HID_02e3] = 1647,
-	[BNXT_ULP_CLASS_HID_39a7] = 1648,
-	[BNXT_ULP_CLASS_HID_2657] = 1649,
-	[BNXT_ULP_CLASS_HID_120b] = 1650,
-	[BNXT_ULP_CLASS_HID_48cf] = 1651,
-	[BNXT_ULP_CLASS_HID_35ff] = 1652,
-	[BNXT_ULP_CLASS_HID_0ff7] = 1653,
-	[BNXT_ULP_CLASS_HID_5953] = 1654,
-	[BNXT_ULP_CLASS_HID_336b] = 1655,
-	[BNXT_ULP_CLASS_HID_201b] = 1656,
-	[BNXT_ULP_CLASS_HID_257f7] = 1657,
-	[BNXT_ULP_CLASS_HID_2858b] = 1658,
-	[BNXT_ULP_CLASS_HID_3108b] = 1659,
-	[BNXT_ULP_CLASS_HID_39b8b] = 1660,
-	[BNXT_ULP_CLASS_HID_24427] = 1661,
-	[BNXT_ULP_CLASS_HID_2cf27] = 1662,
-	[BNXT_ULP_CLASS_HID_35a27] = 1663,
-	[BNXT_ULP_CLASS_HID_388fb] = 1664,
-	[BNXT_ULP_CLASS_HID_23ffb] = 1665,
-	[BNXT_ULP_CLASS_HID_2cafb] = 1666,
-	[BNXT_ULP_CLASS_HID_355fb] = 1667,
-	[BNXT_ULP_CLASS_HID_3838f] = 1668,
-	[BNXT_ULP_CLASS_HID_2528b] = 1669,
-	[BNXT_ULP_CLASS_HID_2815f] = 1670,
-	[BNXT_ULP_CLASS_HID_30c5f] = 1671,
-	[BNXT_ULP_CLASS_HID_3975f] = 1672,
-	[BNXT_ULP_CLASS_HID_21e3f] = 1673,
-	[BNXT_ULP_CLASS_HID_2a93f] = 1674,
-	[BNXT_ULP_CLASS_HID_3343f] = 1675,
-	[BNXT_ULP_CLASS_HID_3bf3f] = 1676,
-	[BNXT_ULP_CLASS_HID_20b6f] = 1677,
-	[BNXT_ULP_CLASS_HID_2966f] = 1678,
-	[BNXT_ULP_CLASS_HID_3216f] = 1679,
-	[BNXT_ULP_CLASS_HID_3ac6f] = 1680,
-	[BNXT_ULP_CLASS_HID_20623] = 1681,
-	[BNXT_ULP_CLASS_HID_29123] = 1682,
-	[BNXT_ULP_CLASS_HID_31c23] = 1683,
-	[BNXT_ULP_CLASS_HID_3a723] = 1684,
-	[BNXT_ULP_CLASS_HID_219f3] = 1685,
-	[BNXT_ULP_CLASS_HID_2a4f3] = 1686,
-	[BNXT_ULP_CLASS_HID_32ff3] = 1687,
-	[BNXT_ULP_CLASS_HID_3baf3] = 1688,
-	[BNXT_ULP_CLASS_HID_24253] = 1689,
-	[BNXT_ULP_CLASS_HID_2cd53] = 1690,
-	[BNXT_ULP_CLASS_HID_35853] = 1691,
-	[BNXT_ULP_CLASS_HID_38667] = 1692,
-	[BNXT_ULP_CLASS_HID_22e83] = 1693,
-	[BNXT_ULP_CLASS_HID_2b983] = 1694,
-	[BNXT_ULP_CLASS_HID_34483] = 1695,
-	[BNXT_ULP_CLASS_HID_3cf83] = 1696,
-	[BNXT_ULP_CLASS_HID_22a57] = 1697,
-	[BNXT_ULP_CLASS_HID_2b557] = 1698,
-	[BNXT_ULP_CLASS_HID_34057] = 1699,
-	[BNXT_ULP_CLASS_HID_3cb57] = 1700,
-	[BNXT_ULP_CLASS_HID_23d67] = 1701,
-	[BNXT_ULP_CLASS_HID_2c867] = 1702,
-	[BNXT_ULP_CLASS_HID_35367] = 1703,
-	[BNXT_ULP_CLASS_HID_3813b] = 1704,
-	[BNXT_ULP_CLASS_HID_2089b] = 1705,
-	[BNXT_ULP_CLASS_HID_2939b] = 1706,
-	[BNXT_ULP_CLASS_HID_31e9b] = 1707,
-	[BNXT_ULP_CLASS_HID_3a99b] = 1708,
-	[BNXT_ULP_CLASS_HID_25237] = 1709,
-	[BNXT_ULP_CLASS_HID_280cb] = 1710,
-	[BNXT_ULP_CLASS_HID_30bcb] = 1711,
-	[BNXT_ULP_CLASS_HID_396cb] = 1712,
-	[BNXT_ULP_CLASS_HID_24dcb] = 1713,
-	[BNXT_ULP_CLASS_HID_2d8cb] = 1714,
-	[BNXT_ULP_CLASS_HID_3069f] = 1715,
-	[BNXT_ULP_CLASS_HID_3919f] = 1716,
-	[BNXT_ULP_CLASS_HID_203af] = 1717,
-	[BNXT_ULP_CLASS_HID_28eaf] = 1718,
-	[BNXT_ULP_CLASS_HID_319af] = 1719,
-	[BNXT_ULP_CLASS_HID_3a4af] = 1720,
-	[BNXT_ULP_CLASS_HID_2513b] = 1721,
-	[BNXT_ULP_CLASS_HID_2dc3b] = 1722,
-	[BNXT_ULP_CLASS_HID_30acf] = 1723,
-	[BNXT_ULP_CLASS_HID_395cf] = 1724,
-	[BNXT_ULP_CLASS_HID_23e6b] = 1725,
-	[BNXT_ULP_CLASS_HID_2c96b] = 1726,
-	[BNXT_ULP_CLASS_HID_3546b] = 1727,
-	[BNXT_ULP_CLASS_HID_3823f] = 1728,
-	[BNXT_ULP_CLASS_HID_2393f] = 1729,
-	[BNXT_ULP_CLASS_HID_2c43f] = 1730,
-	[BNXT_ULP_CLASS_HID_34f3f] = 1731,
-	[BNXT_ULP_CLASS_HID_3da3f] = 1732,
-	[BNXT_ULP_CLASS_HID_24ccf] = 1733,
-	[BNXT_ULP_CLASS_HID_2d7cf] = 1734,
-	[BNXT_ULP_CLASS_HID_30583] = 1735,
-	[BNXT_ULP_CLASS_HID_39083] = 1736,
-	[BNXT_ULP_CLASS_HID_21863] = 1737,
-	[BNXT_ULP_CLASS_HID_2a363] = 1738,
-	[BNXT_ULP_CLASS_HID_32e63] = 1739,
-	[BNXT_ULP_CLASS_HID_3b963] = 1740,
-	[BNXT_ULP_CLASS_HID_20553] = 1741,
-	[BNXT_ULP_CLASS_HID_29053] = 1742,
-	[BNXT_ULP_CLASS_HID_31b53] = 1743,
-	[BNXT_ULP_CLASS_HID_3a653] = 1744,
-	[BNXT_ULP_CLASS_HID_20067] = 1745,
-	[BNXT_ULP_CLASS_HID_28b67] = 1746,
-	[BNXT_ULP_CLASS_HID_31667] = 1747,
-	[BNXT_ULP_CLASS_HID_3a167] = 1748,
-	[BNXT_ULP_CLASS_HID_21337] = 1749,
-	[BNXT_ULP_CLASS_HID_29e37] = 1750,
-	[BNXT_ULP_CLASS_HID_32937] = 1751,
-	[BNXT_ULP_CLASS_HID_3b437] = 1752,
-	[BNXT_ULP_CLASS_HID_23b97] = 1753,
-	[BNXT_ULP_CLASS_HID_2c697] = 1754,
-	[BNXT_ULP_CLASS_HID_35197] = 1755,
-	[BNXT_ULP_CLASS_HID_3dc97] = 1756,
-	[BNXT_ULP_CLASS_HID_228c7] = 1757,
-	[BNXT_ULP_CLASS_HID_2b3c7] = 1758,
-	[BNXT_ULP_CLASS_HID_33ec7] = 1759,
-	[BNXT_ULP_CLASS_HID_3c9c7] = 1760,
-	[BNXT_ULP_CLASS_HID_2239b] = 1761,
-	[BNXT_ULP_CLASS_HID_2ae9b] = 1762,
-	[BNXT_ULP_CLASS_HID_3399b] = 1763,
-	[BNXT_ULP_CLASS_HID_3c49b] = 1764,
-	[BNXT_ULP_CLASS_HID_236ab] = 1765,
-	[BNXT_ULP_CLASS_HID_2c1ab] = 1766,
-	[BNXT_ULP_CLASS_HID_34cab] = 1767,
-	[BNXT_ULP_CLASS_HID_3d7ab] = 1768,
-	[BNXT_ULP_CLASS_HID_202df] = 1769,
-	[BNXT_ULP_CLASS_HID_28ddf] = 1770,
-	[BNXT_ULP_CLASS_HID_318df] = 1771,
-	[BNXT_ULP_CLASS_HID_3a3df] = 1772,
-	[BNXT_ULP_CLASS_HID_24c7b] = 1773,
-	[BNXT_ULP_CLASS_HID_2d77b] = 1774,
-	[BNXT_ULP_CLASS_HID_3050f] = 1775,
-	[BNXT_ULP_CLASS_HID_3900f] = 1776,
-	[BNXT_ULP_CLASS_HID_2470f] = 1777,
-	[BNXT_ULP_CLASS_HID_2d20f] = 1778,
-	[BNXT_ULP_CLASS_HID_300c3] = 1779,
-	[BNXT_ULP_CLASS_HID_38bc3] = 1780,
-	[BNXT_ULP_CLASS_HID_25adf] = 1781,
-	[BNXT_ULP_CLASS_HID_28893] = 1782,
-	[BNXT_ULP_CLASS_HID_31393] = 1783,
-	[BNXT_ULP_CLASS_HID_39e93] = 1784,
-	[BNXT_ULP_CLASS_HID_24b7f] = 1785,
-	[BNXT_ULP_CLASS_HID_2d67f] = 1786,
-	[BNXT_ULP_CLASS_HID_30433] = 1787,
-	[BNXT_ULP_CLASS_HID_38f33] = 1788,
-	[BNXT_ULP_CLASS_HID_237af] = 1789,
-	[BNXT_ULP_CLASS_HID_2c2af] = 1790,
-	[BNXT_ULP_CLASS_HID_34daf] = 1791,
-	[BNXT_ULP_CLASS_HID_3d8af] = 1792,
-	[BNXT_ULP_CLASS_HID_23363] = 1793,
-	[BNXT_ULP_CLASS_HID_2be63] = 1794,
-	[BNXT_ULP_CLASS_HID_34963] = 1795,
-	[BNXT_ULP_CLASS_HID_3d463] = 1796,
-	[BNXT_ULP_CLASS_HID_24633] = 1797,
-	[BNXT_ULP_CLASS_HID_2d133] = 1798,
-	[BNXT_ULP_CLASS_HID_35c33] = 1799,
-	[BNXT_ULP_CLASS_HID_38ac7] = 1800,
-	[BNXT_ULP_CLASS_HID_211a7] = 1801,
-	[BNXT_ULP_CLASS_HID_29ca7] = 1802,
-	[BNXT_ULP_CLASS_HID_327a7] = 1803,
-	[BNXT_ULP_CLASS_HID_3b2a7] = 1804,
-	[BNXT_ULP_CLASS_HID_25bc3] = 1805,
-	[BNXT_ULP_CLASS_HID_28997] = 1806,
-	[BNXT_ULP_CLASS_HID_31497] = 1807,
-	[BNXT_ULP_CLASS_HID_39f97] = 1808,
-	[BNXT_ULP_CLASS_HID_25697] = 1809,
-	[BNXT_ULP_CLASS_HID_284ab] = 1810,
-	[BNXT_ULP_CLASS_HID_30fab] = 1811,
-	[BNXT_ULP_CLASS_HID_39aab] = 1812,
-	[BNXT_ULP_CLASS_HID_20d7b] = 1813,
-	[BNXT_ULP_CLASS_HID_2987b] = 1814,
-	[BNXT_ULP_CLASS_HID_3237b] = 1815,
-	[BNXT_ULP_CLASS_HID_3ae7b] = 1816,
-	[BNXT_ULP_CLASS_HID_235db] = 1817,
-	[BNXT_ULP_CLASS_HID_2c0db] = 1818,
-	[BNXT_ULP_CLASS_HID_34bdb] = 1819,
-	[BNXT_ULP_CLASS_HID_3d6db] = 1820,
-	[BNXT_ULP_CLASS_HID_2220b] = 1821,
-	[BNXT_ULP_CLASS_HID_2ad0b] = 1822,
-	[BNXT_ULP_CLASS_HID_3380b] = 1823,
-	[BNXT_ULP_CLASS_HID_3c30b] = 1824,
-	[BNXT_ULP_CLASS_HID_21ddf] = 1825,
-	[BNXT_ULP_CLASS_HID_2a8df] = 1826,
-	[BNXT_ULP_CLASS_HID_333df] = 1827,
-	[BNXT_ULP_CLASS_HID_3bedf] = 1828,
-	[BNXT_ULP_CLASS_HID_230ef] = 1829,
-	[BNXT_ULP_CLASS_HID_2bbef] = 1830,
-	[BNXT_ULP_CLASS_HID_346ef] = 1831,
-	[BNXT_ULP_CLASS_HID_3d1ef] = 1832,
-	[BNXT_ULP_CLASS_HID_2594f] = 1833,
-	[BNXT_ULP_CLASS_HID_28703] = 1834,
-	[BNXT_ULP_CLASS_HID_31203] = 1835,
-	[BNXT_ULP_CLASS_HID_39d03] = 1836,
-	[BNXT_ULP_CLASS_HID_245bf] = 1837,
-	[BNXT_ULP_CLASS_HID_2d0bf] = 1838,
-	[BNXT_ULP_CLASS_HID_35bbf] = 1839,
-	[BNXT_ULP_CLASS_HID_38a73] = 1840,
-	[BNXT_ULP_CLASS_HID_24173] = 1841,
-	[BNXT_ULP_CLASS_HID_2cc73] = 1842,
-	[BNXT_ULP_CLASS_HID_35773] = 1843,
-	[BNXT_ULP_CLASS_HID_38507] = 1844,
-	[BNXT_ULP_CLASS_HID_25403] = 1845,
-	[BNXT_ULP_CLASS_HID_282d7] = 1846,
-	[BNXT_ULP_CLASS_HID_30dd7] = 1847,
-	[BNXT_ULP_CLASS_HID_398d7] = 1848,
-	[BNXT_ULP_CLASS_HID_244a3] = 1849,
-	[BNXT_ULP_CLASS_HID_2cfa3] = 1850,
-	[BNXT_ULP_CLASS_HID_35aa3] = 1851,
-	[BNXT_ULP_CLASS_HID_38977] = 1852,
-	[BNXT_ULP_CLASS_HID_23193] = 1853,
-	[BNXT_ULP_CLASS_HID_2bc93] = 1854,
-	[BNXT_ULP_CLASS_HID_34793] = 1855,
-	[BNXT_ULP_CLASS_HID_3d293] = 1856,
-	[BNXT_ULP_CLASS_HID_22ca7] = 1857,
-	[BNXT_ULP_CLASS_HID_2b7a7] = 1858,
-	[BNXT_ULP_CLASS_HID_342a7] = 1859,
-	[BNXT_ULP_CLASS_HID_3cda7] = 1860,
-	[BNXT_ULP_CLASS_HID_24077] = 1861,
-	[BNXT_ULP_CLASS_HID_2cb77] = 1862,
-	[BNXT_ULP_CLASS_HID_35677] = 1863,
-	[BNXT_ULP_CLASS_HID_3840b] = 1864,
-	[BNXT_ULP_CLASS_HID_20beb] = 1865,
-	[BNXT_ULP_CLASS_HID_296eb] = 1866,
-	[BNXT_ULP_CLASS_HID_321eb] = 1867,
-	[BNXT_ULP_CLASS_HID_3aceb] = 1868,
-	[BNXT_ULP_CLASS_HID_25507] = 1869,
-	[BNXT_ULP_CLASS_HID_283db] = 1870,
-	[BNXT_ULP_CLASS_HID_30edb] = 1871,
-	[BNXT_ULP_CLASS_HID_399db] = 1872,
-	[BNXT_ULP_CLASS_HID_250db] = 1873,
-	[BNXT_ULP_CLASS_HID_2dbdb] = 1874,
-	[BNXT_ULP_CLASS_HID_309ef] = 1875,
-	[BNXT_ULP_CLASS_HID_394ef] = 1876,
-	[BNXT_ULP_CLASS_HID_206bf] = 1877,
-	[BNXT_ULP_CLASS_HID_291bf] = 1878,
-	[BNXT_ULP_CLASS_HID_31cbf] = 1879,
-	[BNXT_ULP_CLASS_HID_3a7bf] = 1880,
-	[BNXT_ULP_CLASS_HID_22f1f] = 1881,
-	[BNXT_ULP_CLASS_HID_2ba1f] = 1882,
-	[BNXT_ULP_CLASS_HID_3451f] = 1883,
-	[BNXT_ULP_CLASS_HID_3d01f] = 1884,
-	[BNXT_ULP_CLASS_HID_21c4f] = 1885,
-	[BNXT_ULP_CLASS_HID_2a74f] = 1886,
-	[BNXT_ULP_CLASS_HID_3324f] = 1887,
-	[BNXT_ULP_CLASS_HID_3bd4f] = 1888,
-	[BNXT_ULP_CLASS_HID_21703] = 1889,
-	[BNXT_ULP_CLASS_HID_2a203] = 1890,
-	[BNXT_ULP_CLASS_HID_32d03] = 1891,
-	[BNXT_ULP_CLASS_HID_3b803] = 1892,
-	[BNXT_ULP_CLASS_HID_22ad3] = 1893,
-	[BNXT_ULP_CLASS_HID_2b5d3] = 1894,
-	[BNXT_ULP_CLASS_HID_340d3] = 1895,
-	[BNXT_ULP_CLASS_HID_3cbd3] = 1896,
-	[BNXT_ULP_CLASS_HID_252b3] = 1897,
-	[BNXT_ULP_CLASS_HID_28147] = 1898,
-	[BNXT_ULP_CLASS_HID_30c47] = 1899,
-	[BNXT_ULP_CLASS_HID_39747] = 1900,
-	[BNXT_ULP_CLASS_HID_23fe3] = 1901,
-	[BNXT_ULP_CLASS_HID_2cae3] = 1902,
-	[BNXT_ULP_CLASS_HID_355e3] = 1903,
-	[BNXT_ULP_CLASS_HID_383b7] = 1904,
-	[BNXT_ULP_CLASS_HID_23ab7] = 1905,
-	[BNXT_ULP_CLASS_HID_2c5b7] = 1906,
-	[BNXT_ULP_CLASS_HID_350b7] = 1907,
-	[BNXT_ULP_CLASS_HID_3dbb7] = 1908,
-	[BNXT_ULP_CLASS_HID_24e47] = 1909,
-	[BNXT_ULP_CLASS_HID_2d947] = 1910,
-	[BNXT_ULP_CLASS_HID_3071b] = 1911,
-	[BNXT_ULP_CLASS_HID_3921b] = 1912,
-	[BNXT_ULP_CLASS_HID_2326f] = 1913,
-	[BNXT_ULP_CLASS_HID_2bd6f] = 1914,
-	[BNXT_ULP_CLASS_HID_3486f] = 1915,
-	[BNXT_ULP_CLASS_HID_3d36f] = 1916,
-	[BNXT_ULP_CLASS_HID_21f5f] = 1917,
-	[BNXT_ULP_CLASS_HID_2aa5f] = 1918,
-	[BNXT_ULP_CLASS_HID_3355f] = 1919,
-	[BNXT_ULP_CLASS_HID_3c05f] = 1920,
-	[BNXT_ULP_CLASS_HID_21a13] = 1921,
-	[BNXT_ULP_CLASS_HID_2a513] = 1922,
-	[BNXT_ULP_CLASS_HID_33013] = 1923,
-	[BNXT_ULP_CLASS_HID_3bb13] = 1924,
-	[BNXT_ULP_CLASS_HID_22d23] = 1925,
-	[BNXT_ULP_CLASS_HID_2b823] = 1926,
-	[BNXT_ULP_CLASS_HID_34323] = 1927,
-	[BNXT_ULP_CLASS_HID_3ce23] = 1928,
-	[BNXT_ULP_CLASS_HID_25583] = 1929,
-	[BNXT_ULP_CLASS_HID_28457] = 1930,
-	[BNXT_ULP_CLASS_HID_30f57] = 1931,
-	[BNXT_ULP_CLASS_HID_39a57] = 1932,
-	[BNXT_ULP_CLASS_HID_242f3] = 1933,
-	[BNXT_ULP_CLASS_HID_2cdf3] = 1934,
-	[BNXT_ULP_CLASS_HID_358f3] = 1935,
-	[BNXT_ULP_CLASS_HID_38687] = 1936,
-	[BNXT_ULP_CLASS_HID_23d87] = 1937,
-	[BNXT_ULP_CLASS_HID_2c887] = 1938,
-	[BNXT_ULP_CLASS_HID_35387] = 1939,
-	[BNXT_ULP_CLASS_HID_3825b] = 1940,
-	[BNXT_ULP_CLASS_HID_25157] = 1941,
-	[BNXT_ULP_CLASS_HID_2dc57] = 1942,
-	[BNXT_ULP_CLASS_HID_30a6b] = 1943,
-	[BNXT_ULP_CLASS_HID_3956b] = 1944,
-	[BNXT_ULP_CLASS_HID_22c53] = 1945,
-	[BNXT_ULP_CLASS_HID_2b753] = 1946,
-	[BNXT_ULP_CLASS_HID_34253] = 1947,
-	[BNXT_ULP_CLASS_HID_3cd53] = 1948,
-	[BNXT_ULP_CLASS_HID_21883] = 1949,
-	[BNXT_ULP_CLASS_HID_2a383] = 1950,
-	[BNXT_ULP_CLASS_HID_32e83] = 1951,
-	[BNXT_ULP_CLASS_HID_3b983] = 1952,
-	[BNXT_ULP_CLASS_HID_21457] = 1953,
-	[BNXT_ULP_CLASS_HID_29f57] = 1954,
-	[BNXT_ULP_CLASS_HID_32a57] = 1955,
-	[BNXT_ULP_CLASS_HID_3b557] = 1956,
-	[BNXT_ULP_CLASS_HID_22767] = 1957,
-	[BNXT_ULP_CLASS_HID_2b267] = 1958,
-	[BNXT_ULP_CLASS_HID_33d67] = 1959,
-	[BNXT_ULP_CLASS_HID_3c867] = 1960,
-	[BNXT_ULP_CLASS_HID_24fc7] = 1961,
-	[BNXT_ULP_CLASS_HID_2dac7] = 1962,
-	[BNXT_ULP_CLASS_HID_3089b] = 1963,
-	[BNXT_ULP_CLASS_HID_3939b] = 1964,
-	[BNXT_ULP_CLASS_HID_23c37] = 1965,
-	[BNXT_ULP_CLASS_HID_2c737] = 1966,
-	[BNXT_ULP_CLASS_HID_35237] = 1967,
-	[BNXT_ULP_CLASS_HID_380cb] = 1968,
-	[BNXT_ULP_CLASS_HID_237cb] = 1969,
-	[BNXT_ULP_CLASS_HID_2c2cb] = 1970,
-	[BNXT_ULP_CLASS_HID_34dcb] = 1971,
-	[BNXT_ULP_CLASS_HID_3d8cb] = 1972,
-	[BNXT_ULP_CLASS_HID_24a9b] = 1973,
-	[BNXT_ULP_CLASS_HID_2d59b] = 1974,
-	[BNXT_ULP_CLASS_HID_303af] = 1975,
-	[BNXT_ULP_CLASS_HID_38eaf] = 1976,
-	[BNXT_ULP_CLASS_HID_253b] = 1977,
-	[BNXT_ULP_CLASS_HID_2bf7] = 1978,
-	[BNXT_ULP_CLASS_HID_1827] = 1979,
-	[BNXT_ULP_CLASS_HID_4f6b] = 1980,
-	[BNXT_ULP_CLASS_HID_3c5b] = 1981,
-	[BNXT_ULP_CLASS_HID_1653] = 1982,
-	[BNXT_ULP_CLASS_HID_0283] = 1983,
-	[BNXT_ULP_CLASS_HID_39c7] = 1984,
-	[BNXT_ULP_CLASS_HID_2637] = 1985,
-	[BNXT_ULP_CLASS_HID_126b] = 1986,
-	[BNXT_ULP_CLASS_HID_48af] = 1987,
-	[BNXT_ULP_CLASS_HID_359f] = 1988,
-	[BNXT_ULP_CLASS_HID_0f97] = 1989,
-	[BNXT_ULP_CLASS_HID_5933] = 1990,
-	[BNXT_ULP_CLASS_HID_330b] = 1991,
-	[BNXT_ULP_CLASS_HID_207b] = 1992,
-	[BNXT_ULP_CLASS_HID_374e] = 1993,
-	[BNXT_ULP_CLASS_HID_11ee] = 1994,
-	[BNXT_ULP_CLASS_HID_423a] = 1995,
-	[BNXT_ULP_CLASS_HID_0cd6] = 1996,
-	[BNXT_ULP_CLASS_HID_310a] = 1997,
-	[BNXT_ULP_CLASS_HID_469e] = 1998,
-	[BNXT_ULP_CLASS_HID_5ce6] = 1999,
-	[BNXT_ULP_CLASS_HID_0692] = 2000,
-	[BNXT_ULP_CLASS_HID_1c7e] = 2001,
-	[BNXT_ULP_CLASS_HID_55c2] = 2002,
-	[BNXT_ULP_CLASS_HID_2b2a] = 2003,
-	[BNXT_ULP_CLASS_HID_15c6] = 2004,
-	[BNXT_ULP_CLASS_HID_163a] = 2005,
-	[BNXT_ULP_CLASS_HID_2f8e] = 2006,
-	[BNXT_ULP_CLASS_HID_2516] = 2007,
-	[BNXT_ULP_CLASS_HID_4b76] = 2008,
-	[BNXT_ULP_CLASS_HID_10e6] = 2009,
-	[BNXT_ULP_CLASS_HID_264a] = 2010,
-	[BNXT_ULP_CLASS_HID_3fd2] = 2011,
-	[BNXT_ULP_CLASS_HID_4532] = 2012,
-	[BNXT_ULP_CLASS_HID_4996] = 2013,
-	[BNXT_ULP_CLASS_HID_2036] = 2014,
-	[BNXT_ULP_CLASS_HID_399e] = 2015,
-	[BNXT_ULP_CLASS_HID_5ffe] = 2016,
-	[BNXT_ULP_CLASS_HID_34fe] = 2017,
-	[BNXT_ULP_CLASS_HID_3a32] = 2018,
-	[BNXT_ULP_CLASS_HID_14d2] = 2019,
-	[BNXT_ULP_CLASS_HID_4a42] = 2020,
-	[BNXT_ULP_CLASS_HID_376e] = 2021,
-	[BNXT_ULP_CLASS_HID_12d6e] = 2022,
-	[BNXT_ULP_CLASS_HID_2436e] = 2023,
-	[BNXT_ULP_CLASS_HID_31dba] = 2024,
-	[BNXT_ULP_CLASS_HID_11ce] = 2025,
-	[BNXT_ULP_CLASS_HID_107ce] = 2026,
-	[BNXT_ULP_CLASS_HID_23dce] = 2027,
-	[BNXT_ULP_CLASS_HID_353ce] = 2028,
-	[BNXT_ULP_CLASS_HID_421a] = 2029,
-	[BNXT_ULP_CLASS_HID_11d56] = 2030,
-	[BNXT_ULP_CLASS_HID_23356] = 2031,
-	[BNXT_ULP_CLASS_HID_32956] = 2032,
-	[BNXT_ULP_CLASS_HID_0cf6] = 2033,
-	[BNXT_ULP_CLASS_HID_122f6] = 2034,
-	[BNXT_ULP_CLASS_HID_258f6] = 2035,
-	[BNXT_ULP_CLASS_HID_313c2] = 2036,
-	[BNXT_ULP_CLASS_HID_312a] = 2037,
-	[BNXT_ULP_CLASS_HID_1272a] = 2038,
-	[BNXT_ULP_CLASS_HID_25d2a] = 2039,
-	[BNXT_ULP_CLASS_HID_31466] = 2040,
-	[BNXT_ULP_CLASS_HID_46be] = 2041,
-	[BNXT_ULP_CLASS_HID_1018a] = 2042,
-	[BNXT_ULP_CLASS_HID_2378a] = 2043,
-	[BNXT_ULP_CLASS_HID_32d8a] = 2044,
-	[BNXT_ULP_CLASS_HID_5cc6] = 2045,
-	[BNXT_ULP_CLASS_HID_11712] = 2046,
-	[BNXT_ULP_CLASS_HID_20d12] = 2047,
-	[BNXT_ULP_CLASS_HID_32312] = 2048,
-	[BNXT_ULP_CLASS_HID_06b2] = 2049,
-	[BNXT_ULP_CLASS_HID_13cb2] = 2050,
-	[BNXT_ULP_CLASS_HID_252b2] = 2051,
-	[BNXT_ULP_CLASS_HID_348b2] = 2052,
-	[BNXT_ULP_CLASS_HID_1c5e] = 2053,
-	[BNXT_ULP_CLASS_HID_1325e] = 2054,
-	[BNXT_ULP_CLASS_HID_2285e] = 2055,
-	[BNXT_ULP_CLASS_HID_35e5e] = 2056,
-	[BNXT_ULP_CLASS_HID_55e2] = 2057,
-	[BNXT_ULP_CLASS_HID_14be2] = 2058,
-	[BNXT_ULP_CLASS_HID_2023e] = 2059,
-	[BNXT_ULP_CLASS_HID_3383e] = 2060,
-	[BNXT_ULP_CLASS_HID_2b0a] = 2061,
-	[BNXT_ULP_CLASS_HID_1410a] = 2062,
-	[BNXT_ULP_CLASS_HID_21846] = 2063,
-	[BNXT_ULP_CLASS_HID_30e46] = 2064,
-	[BNXT_ULP_CLASS_HID_15e6] = 2065,
-	[BNXT_ULP_CLASS_HID_10be6] = 2066,
-	[BNXT_ULP_CLASS_HID_221e6] = 2067,
-	[BNXT_ULP_CLASS_HID_357e6] = 2068,
-	[BNXT_ULP_CLASS_HID_161a] = 2069,
-	[BNXT_ULP_CLASS_HID_10c1a] = 2070,
-	[BNXT_ULP_CLASS_HID_2221a] = 2071,
-	[BNXT_ULP_CLASS_HID_3581a] = 2072,
-	[BNXT_ULP_CLASS_HID_2fae] = 2073,
-	[BNXT_ULP_CLASS_HID_145ae] = 2074,
-	[BNXT_ULP_CLASS_HID_21cfa] = 2075,
-	[BNXT_ULP_CLASS_HID_332fa] = 2076,
-	[BNXT_ULP_CLASS_HID_2536] = 2077,
-	[BNXT_ULP_CLASS_HID_15b36] = 2078,
-	[BNXT_ULP_CLASS_HID_21202] = 2079,
-	[BNXT_ULP_CLASS_HID_30802] = 2080,
-	[BNXT_ULP_CLASS_HID_4b56] = 2081,
-	[BNXT_ULP_CLASS_HID_105a2] = 2082,
-	[BNXT_ULP_CLASS_HID_23ba2] = 2083,
-	[BNXT_ULP_CLASS_HID_351a2] = 2084,
-	[BNXT_ULP_CLASS_HID_10c6] = 2085,
-	[BNXT_ULP_CLASS_HID_106c6] = 2086,
-	[BNXT_ULP_CLASS_HID_23cc6] = 2087,
-	[BNXT_ULP_CLASS_HID_352c6] = 2088,
-	[BNXT_ULP_CLASS_HID_266a] = 2089,
-	[BNXT_ULP_CLASS_HID_15c6a] = 2090,
-	[BNXT_ULP_CLASS_HID_216a6] = 2091,
-	[BNXT_ULP_CLASS_HID_30ca6] = 2092,
-	[BNXT_ULP_CLASS_HID_3ff2] = 2093,
-	[BNXT_ULP_CLASS_HID_155f2] = 2094,
-	[BNXT_ULP_CLASS_HID_24bf2] = 2095,
-	[BNXT_ULP_CLASS_HID_302ce] = 2096,
-	[BNXT_ULP_CLASS_HID_4512] = 2097,
-	[BNXT_ULP_CLASS_HID_11c6e] = 2098,
-	[BNXT_ULP_CLASS_HID_2326e] = 2099,
-	[BNXT_ULP_CLASS_HID_3286e] = 2100,
-	[BNXT_ULP_CLASS_HID_49b6] = 2101,
-	[BNXT_ULP_CLASS_HID_10082] = 2102,
-	[BNXT_ULP_CLASS_HID_23682] = 2103,
-	[BNXT_ULP_CLASS_HID_32c82] = 2104,
-	[BNXT_ULP_CLASS_HID_2016] = 2105,
-	[BNXT_ULP_CLASS_HID_15616] = 2106,
-	[BNXT_ULP_CLASS_HID_21162] = 2107,
-	[BNXT_ULP_CLASS_HID_30762] = 2108,
-	[BNXT_ULP_CLASS_HID_39be] = 2109,
-	[BNXT_ULP_CLASS_HID_12fbe] = 2110,
-	[BNXT_ULP_CLASS_HID_245be] = 2111,
-	[BNXT_ULP_CLASS_HID_31c8a] = 2112,
-	[BNXT_ULP_CLASS_HID_5fde] = 2113,
-	[BNXT_ULP_CLASS_HID_1162a] = 2114,
-	[BNXT_ULP_CLASS_HID_20c2a] = 2115,
-	[BNXT_ULP_CLASS_HID_3222a] = 2116,
-	[BNXT_ULP_CLASS_HID_34de] = 2117,
-	[BNXT_ULP_CLASS_HID_3a12] = 2118,
-	[BNXT_ULP_CLASS_HID_14f2] = 2119,
-	[BNXT_ULP_CLASS_HID_4a62] = 2120,
-	[BNXT_ULP_CLASS_HID_370e] = 2121,
-	[BNXT_ULP_CLASS_HID_12d0e] = 2122,
-	[BNXT_ULP_CLASS_HID_2430e] = 2123,
-	[BNXT_ULP_CLASS_HID_31dda] = 2124,
-	[BNXT_ULP_CLASS_HID_11ae] = 2125,
-	[BNXT_ULP_CLASS_HID_107ae] = 2126,
-	[BNXT_ULP_CLASS_HID_23dae] = 2127,
-	[BNXT_ULP_CLASS_HID_353ae] = 2128,
-	[BNXT_ULP_CLASS_HID_427a] = 2129,
-	[BNXT_ULP_CLASS_HID_11d36] = 2130,
-	[BNXT_ULP_CLASS_HID_23336] = 2131,
-	[BNXT_ULP_CLASS_HID_32936] = 2132,
-	[BNXT_ULP_CLASS_HID_0c96] = 2133,
-	[BNXT_ULP_CLASS_HID_12296] = 2134,
-	[BNXT_ULP_CLASS_HID_25896] = 2135,
-	[BNXT_ULP_CLASS_HID_313a2] = 2136,
-	[BNXT_ULP_CLASS_HID_314a] = 2137,
-	[BNXT_ULP_CLASS_HID_1274a] = 2138,
-	[BNXT_ULP_CLASS_HID_25d4a] = 2139,
-	[BNXT_ULP_CLASS_HID_31406] = 2140,
-	[BNXT_ULP_CLASS_HID_46de] = 2141,
-	[BNXT_ULP_CLASS_HID_101ea] = 2142,
-	[BNXT_ULP_CLASS_HID_237ea] = 2143,
-	[BNXT_ULP_CLASS_HID_32dea] = 2144,
-	[BNXT_ULP_CLASS_HID_5ca6] = 2145,
-	[BNXT_ULP_CLASS_HID_11772] = 2146,
-	[BNXT_ULP_CLASS_HID_20d72] = 2147,
-	[BNXT_ULP_CLASS_HID_32372] = 2148,
-	[BNXT_ULP_CLASS_HID_06d2] = 2149,
-	[BNXT_ULP_CLASS_HID_13cd2] = 2150,
-	[BNXT_ULP_CLASS_HID_252d2] = 2151,
-	[BNXT_ULP_CLASS_HID_348d2] = 2152,
-	[BNXT_ULP_CLASS_HID_1c3e] = 2153,
-	[BNXT_ULP_CLASS_HID_1323e] = 2154,
-	[BNXT_ULP_CLASS_HID_2283e] = 2155,
-	[BNXT_ULP_CLASS_HID_35e3e] = 2156,
-	[BNXT_ULP_CLASS_HID_5582] = 2157,
-	[BNXT_ULP_CLASS_HID_14b82] = 2158,
-	[BNXT_ULP_CLASS_HID_2025e] = 2159,
-	[BNXT_ULP_CLASS_HID_3385e] = 2160,
-	[BNXT_ULP_CLASS_HID_2b6a] = 2161,
-	[BNXT_ULP_CLASS_HID_1416a] = 2162,
-	[BNXT_ULP_CLASS_HID_21826] = 2163,
-	[BNXT_ULP_CLASS_HID_30e26] = 2164,
-	[BNXT_ULP_CLASS_HID_1586] = 2165,
-	[BNXT_ULP_CLASS_HID_10b86] = 2166,
-	[BNXT_ULP_CLASS_HID_22186] = 2167,
-	[BNXT_ULP_CLASS_HID_35786] = 2168,
-	[BNXT_ULP_CLASS_HID_167a] = 2169,
-	[BNXT_ULP_CLASS_HID_10c7a] = 2170,
-	[BNXT_ULP_CLASS_HID_2227a] = 2171,
-	[BNXT_ULP_CLASS_HID_3587a] = 2172,
-	[BNXT_ULP_CLASS_HID_2fce] = 2173,
-	[BNXT_ULP_CLASS_HID_145ce] = 2174,
-	[BNXT_ULP_CLASS_HID_21c9a] = 2175,
-	[BNXT_ULP_CLASS_HID_3329a] = 2176,
-	[BNXT_ULP_CLASS_HID_2556] = 2177,
-	[BNXT_ULP_CLASS_HID_15b56] = 2178,
-	[BNXT_ULP_CLASS_HID_21262] = 2179,
-	[BNXT_ULP_CLASS_HID_30862] = 2180,
-	[BNXT_ULP_CLASS_HID_4b36] = 2181,
-	[BNXT_ULP_CLASS_HID_105c2] = 2182,
-	[BNXT_ULP_CLASS_HID_23bc2] = 2183,
-	[BNXT_ULP_CLASS_HID_351c2] = 2184,
-	[BNXT_ULP_CLASS_HID_10a6] = 2185,
-	[BNXT_ULP_CLASS_HID_106a6] = 2186,
-	[BNXT_ULP_CLASS_HID_23ca6] = 2187,
-	[BNXT_ULP_CLASS_HID_352a6] = 2188,
-	[BNXT_ULP_CLASS_HID_260a] = 2189,
-	[BNXT_ULP_CLASS_HID_15c0a] = 2190,
-	[BNXT_ULP_CLASS_HID_216c6] = 2191,
-	[BNXT_ULP_CLASS_HID_30cc6] = 2192,
-	[BNXT_ULP_CLASS_HID_3f92] = 2193,
-	[BNXT_ULP_CLASS_HID_15592] = 2194,
-	[BNXT_ULP_CLASS_HID_24b92] = 2195,
-	[BNXT_ULP_CLASS_HID_302ae] = 2196,
-	[BNXT_ULP_CLASS_HID_4572] = 2197,
-	[BNXT_ULP_CLASS_HID_11c0e] = 2198,
-	[BNXT_ULP_CLASS_HID_2320e] = 2199,
-	[BNXT_ULP_CLASS_HID_3280e] = 2200,
-	[BNXT_ULP_CLASS_HID_49d6] = 2201,
-	[BNXT_ULP_CLASS_HID_100e2] = 2202,
-	[BNXT_ULP_CLASS_HID_236e2] = 2203,
-	[BNXT_ULP_CLASS_HID_32ce2] = 2204,
-	[BNXT_ULP_CLASS_HID_2076] = 2205,
-	[BNXT_ULP_CLASS_HID_15676] = 2206,
-	[BNXT_ULP_CLASS_HID_21102] = 2207,
-	[BNXT_ULP_CLASS_HID_30702] = 2208,
-	[BNXT_ULP_CLASS_HID_39de] = 2209,
-	[BNXT_ULP_CLASS_HID_12fde] = 2210,
-	[BNXT_ULP_CLASS_HID_245de] = 2211,
-	[BNXT_ULP_CLASS_HID_31cea] = 2212,
-	[BNXT_ULP_CLASS_HID_5fbe] = 2213,
-	[BNXT_ULP_CLASS_HID_1164a] = 2214,
-	[BNXT_ULP_CLASS_HID_20c4a] = 2215,
-	[BNXT_ULP_CLASS_HID_3224a] = 2216,
-	[BNXT_ULP_CLASS_HID_34be] = 2217,
-	[BNXT_ULP_CLASS_HID_3a72] = 2218,
-	[BNXT_ULP_CLASS_HID_1492] = 2219,
-	[BNXT_ULP_CLASS_HID_4a02] = 2220,
-	[BNXT_ULP_CLASS_HID_09ea] = 2221,
-	[BNXT_ULP_CLASS_HID_2912] = 2222,
-	[BNXT_ULP_CLASS_HID_03b2] = 2223,
-	[BNXT_ULP_CLASS_HID_5f7e] = 2224,
-	[BNXT_ULP_CLASS_HID_03a6] = 2225,
-	[BNXT_ULP_CLASS_HID_23ce] = 2226,
-	[BNXT_ULP_CLASS_HID_1a6e] = 2227,
-	[BNXT_ULP_CLASS_HID_593a] = 2228,
-	[BNXT_ULP_CLASS_HID_4dce] = 2229,
-	[BNXT_ULP_CLASS_HID_0e02] = 2230,
-	[BNXT_ULP_CLASS_HID_4796] = 2231,
-	[BNXT_ULP_CLASS_HID_246e] = 2232,
-	[BNXT_ULP_CLASS_HID_478a] = 2233,
-	[BNXT_ULP_CLASS_HID_08fe] = 2234,
-	[BNXT_ULP_CLASS_HID_5e52] = 2235,
-	[BNXT_ULP_CLASS_HID_3e2a] = 2236,
-	[BNXT_ULP_CLASS_HID_5e46] = 2237,
-	[BNXT_ULP_CLASS_HID_02ba] = 2238,
-	[BNXT_ULP_CLASS_HID_580e] = 2239,
-	[BNXT_ULP_CLASS_HID_38e6] = 2240,
-	[BNXT_ULP_CLASS_HID_5802] = 2241,
-	[BNXT_ULP_CLASS_HID_1d76] = 2242,
-	[BNXT_ULP_CLASS_HID_52ca] = 2243,
-	[BNXT_ULP_CLASS_HID_32a2] = 2244,
-	[BNXT_ULP_CLASS_HID_34f6] = 2245,
-	[BNXT_ULP_CLASS_HID_3a3a] = 2246,
-	[BNXT_ULP_CLASS_HID_5a22] = 2247,
-	[BNXT_ULP_CLASS_HID_541e] = 2248,
-	[BNXT_ULP_CLASS_HID_09ca] = 2249,
-	[BNXT_ULP_CLASS_HID_0216] = 2250,
-	[BNXT_ULP_CLASS_HID_1f62] = 2251,
-	[BNXT_ULP_CLASS_HID_1bae] = 2252,
-	[BNXT_ULP_CLASS_HID_2932] = 2253,
-	[BNXT_ULP_CLASS_HID_227e] = 2254,
-	[BNXT_ULP_CLASS_HID_3f4a] = 2255,
-	[BNXT_ULP_CLASS_HID_3b96] = 2256,
-	[BNXT_ULP_CLASS_HID_0392] = 2257,
-	[BNXT_ULP_CLASS_HID_1cde] = 2258,
-	[BNXT_ULP_CLASS_HID_192a] = 2259,
-	[BNXT_ULP_CLASS_HID_1276] = 2260,
-	[BNXT_ULP_CLASS_HID_5f5e] = 2261,
-	[BNXT_ULP_CLASS_HID_5baa] = 2262,
-	[BNXT_ULP_CLASS_HID_54f6] = 2263,
-	[BNXT_ULP_CLASS_HID_51c2] = 2264,
-	[BNXT_ULP_CLASS_HID_0386] = 2265,
-	[BNXT_ULP_CLASS_HID_1cd2] = 2266,
-	[BNXT_ULP_CLASS_HID_191e] = 2267,
-	[BNXT_ULP_CLASS_HID_126a] = 2268,
-	[BNXT_ULP_CLASS_HID_23ee] = 2269,
-	[BNXT_ULP_CLASS_HID_3c3a] = 2270,
-	[BNXT_ULP_CLASS_HID_3906] = 2271,
-	[BNXT_ULP_CLASS_HID_3252] = 2272,
-	[BNXT_ULP_CLASS_HID_1a4e] = 2273,
-	[BNXT_ULP_CLASS_HID_169a] = 2274,
-	[BNXT_ULP_CLASS_HID_13e6] = 2275,
-	[BNXT_ULP_CLASS_HID_4be6] = 2276,
-	[BNXT_ULP_CLASS_HID_591a] = 2277,
-	[BNXT_ULP_CLASS_HID_5266] = 2278,
-	[BNXT_ULP_CLASS_HID_2eb2] = 2279,
-	[BNXT_ULP_CLASS_HID_2bfe] = 2280,
-	[BNXT_ULP_CLASS_HID_4dee] = 2281,
-	[BNXT_ULP_CLASS_HID_463a] = 2282,
-	[BNXT_ULP_CLASS_HID_4306] = 2283,
-	[BNXT_ULP_CLASS_HID_5c52] = 2284,
-	[BNXT_ULP_CLASS_HID_0e22] = 2285,
-	[BNXT_ULP_CLASS_HID_0b6e] = 2286,
-	[BNXT_ULP_CLASS_HID_07ba] = 2287,
-	[BNXT_ULP_CLASS_HID_0086] = 2288,
-	[BNXT_ULP_CLASS_HID_47b6] = 2289,
-	[BNXT_ULP_CLASS_HID_4082] = 2290,
-	[BNXT_ULP_CLASS_HID_5dce] = 2291,
-	[BNXT_ULP_CLASS_HID_561a] = 2292,
-	[BNXT_ULP_CLASS_HID_244e] = 2293,
-	[BNXT_ULP_CLASS_HID_209a] = 2294,
-	[BNXT_ULP_CLASS_HID_3de6] = 2295,
-	[BNXT_ULP_CLASS_HID_3632] = 2296,
-	[BNXT_ULP_CLASS_HID_47aa] = 2297,
-	[BNXT_ULP_CLASS_HID_40f6] = 2298,
-	[BNXT_ULP_CLASS_HID_5dc2] = 2299,
-	[BNXT_ULP_CLASS_HID_560e] = 2300,
-	[BNXT_ULP_CLASS_HID_08de] = 2301,
-	[BNXT_ULP_CLASS_HID_052a] = 2302,
-	[BNXT_ULP_CLASS_HID_1e76] = 2303,
-	[BNXT_ULP_CLASS_HID_1b42] = 2304,
-	[BNXT_ULP_CLASS_HID_5e72] = 2305,
-	[BNXT_ULP_CLASS_HID_5abe] = 2306,
-	[BNXT_ULP_CLASS_HID_578a] = 2307,
-	[BNXT_ULP_CLASS_HID_50d6] = 2308,
-	[BNXT_ULP_CLASS_HID_3e0a] = 2309,
-	[BNXT_ULP_CLASS_HID_3b56] = 2310,
-	[BNXT_ULP_CLASS_HID_37a2] = 2311,
-	[BNXT_ULP_CLASS_HID_30ee] = 2312,
-	[BNXT_ULP_CLASS_HID_5e66] = 2313,
-	[BNXT_ULP_CLASS_HID_5ab2] = 2314,
-	[BNXT_ULP_CLASS_HID_57fe] = 2315,
-	[BNXT_ULP_CLASS_HID_50ca] = 2316,
-	[BNXT_ULP_CLASS_HID_029a] = 2317,
-	[BNXT_ULP_CLASS_HID_1fe6] = 2318,
-	[BNXT_ULP_CLASS_HID_1832] = 2319,
-	[BNXT_ULP_CLASS_HID_157e] = 2320,
-	[BNXT_ULP_CLASS_HID_582e] = 2321,
-	[BNXT_ULP_CLASS_HID_557a] = 2322,
-	[BNXT_ULP_CLASS_HID_2e46] = 2323,
-	[BNXT_ULP_CLASS_HID_2a92] = 2324,
-	[BNXT_ULP_CLASS_HID_38c6] = 2325,
-	[BNXT_ULP_CLASS_HID_3512] = 2326,
-	[BNXT_ULP_CLASS_HID_0e5e] = 2327,
-	[BNXT_ULP_CLASS_HID_0aaa] = 2328,
-	[BNXT_ULP_CLASS_HID_5822] = 2329,
-	[BNXT_ULP_CLASS_HID_556e] = 2330,
-	[BNXT_ULP_CLASS_HID_51ba] = 2331,
-	[BNXT_ULP_CLASS_HID_2a86] = 2332,
-	[BNXT_ULP_CLASS_HID_1d56] = 2333,
-	[BNXT_ULP_CLASS_HID_19a2] = 2334,
-	[BNXT_ULP_CLASS_HID_12ee] = 2335,
-	[BNXT_ULP_CLASS_HID_4aee] = 2336,
-	[BNXT_ULP_CLASS_HID_52ea] = 2337,
-	[BNXT_ULP_CLASS_HID_2f36] = 2338,
-	[BNXT_ULP_CLASS_HID_2802] = 2339,
-	[BNXT_ULP_CLASS_HID_254e] = 2340,
-	[BNXT_ULP_CLASS_HID_3282] = 2341,
-	[BNXT_ULP_CLASS_HID_0fce] = 2342,
-	[BNXT_ULP_CLASS_HID_081a] = 2343,
-	[BNXT_ULP_CLASS_HID_0566] = 2344,
-	[BNXT_ULP_CLASS_HID_34d6] = 2345,
-	[BNXT_ULP_CLASS_HID_3a1a] = 2346,
-	[BNXT_ULP_CLASS_HID_5a02] = 2347,
-	[BNXT_ULP_CLASS_HID_543e] = 2348,
-	[BNXT_ULP_CLASS_HID_09aa] = 2349,
-	[BNXT_ULP_CLASS_HID_0276] = 2350,
-	[BNXT_ULP_CLASS_HID_1f02] = 2351,
-	[BNXT_ULP_CLASS_HID_1bce] = 2352,
-	[BNXT_ULP_CLASS_HID_2952] = 2353,
-	[BNXT_ULP_CLASS_HID_221e] = 2354,
-	[BNXT_ULP_CLASS_HID_3f2a] = 2355,
-	[BNXT_ULP_CLASS_HID_3bf6] = 2356,
-	[BNXT_ULP_CLASS_HID_03f2] = 2357,
-	[BNXT_ULP_CLASS_HID_1cbe] = 2358,
-	[BNXT_ULP_CLASS_HID_194a] = 2359,
-	[BNXT_ULP_CLASS_HID_1216] = 2360,
-	[BNXT_ULP_CLASS_HID_5f3e] = 2361,
-	[BNXT_ULP_CLASS_HID_5bca] = 2362,
-	[BNXT_ULP_CLASS_HID_5496] = 2363,
-	[BNXT_ULP_CLASS_HID_51a2] = 2364,
-	[BNXT_ULP_CLASS_HID_03e6] = 2365,
-	[BNXT_ULP_CLASS_HID_1cb2] = 2366,
-	[BNXT_ULP_CLASS_HID_197e] = 2367,
-	[BNXT_ULP_CLASS_HID_120a] = 2368,
-	[BNXT_ULP_CLASS_HID_238e] = 2369,
-	[BNXT_ULP_CLASS_HID_3c5a] = 2370,
-	[BNXT_ULP_CLASS_HID_3966] = 2371,
-	[BNXT_ULP_CLASS_HID_3232] = 2372,
-	[BNXT_ULP_CLASS_HID_1a2e] = 2373,
-	[BNXT_ULP_CLASS_HID_16fa] = 2374,
-	[BNXT_ULP_CLASS_HID_1386] = 2375,
-	[BNXT_ULP_CLASS_HID_4b86] = 2376,
-	[BNXT_ULP_CLASS_HID_597a] = 2377,
-	[BNXT_ULP_CLASS_HID_5206] = 2378,
-	[BNXT_ULP_CLASS_HID_2ed2] = 2379,
-	[BNXT_ULP_CLASS_HID_2b9e] = 2380,
-	[BNXT_ULP_CLASS_HID_4d8e] = 2381,
-	[BNXT_ULP_CLASS_HID_465a] = 2382,
-	[BNXT_ULP_CLASS_HID_4366] = 2383,
-	[BNXT_ULP_CLASS_HID_5c32] = 2384,
-	[BNXT_ULP_CLASS_HID_0e42] = 2385,
-	[BNXT_ULP_CLASS_HID_0b0e] = 2386,
-	[BNXT_ULP_CLASS_HID_07da] = 2387,
-	[BNXT_ULP_CLASS_HID_00e6] = 2388,
-	[BNXT_ULP_CLASS_HID_47d6] = 2389,
-	[BNXT_ULP_CLASS_HID_40e2] = 2390,
-	[BNXT_ULP_CLASS_HID_5dae] = 2391,
-	[BNXT_ULP_CLASS_HID_567a] = 2392,
-	[BNXT_ULP_CLASS_HID_242e] = 2393,
-	[BNXT_ULP_CLASS_HID_20fa] = 2394,
-	[BNXT_ULP_CLASS_HID_3d86] = 2395,
-	[BNXT_ULP_CLASS_HID_3652] = 2396,
-	[BNXT_ULP_CLASS_HID_47ca] = 2397,
-	[BNXT_ULP_CLASS_HID_4096] = 2398,
-	[BNXT_ULP_CLASS_HID_5da2] = 2399,
-	[BNXT_ULP_CLASS_HID_566e] = 2400,
-	[BNXT_ULP_CLASS_HID_08be] = 2401,
-	[BNXT_ULP_CLASS_HID_054a] = 2402,
-	[BNXT_ULP_CLASS_HID_1e16] = 2403,
-	[BNXT_ULP_CLASS_HID_1b22] = 2404,
-	[BNXT_ULP_CLASS_HID_5e12] = 2405,
-	[BNXT_ULP_CLASS_HID_5ade] = 2406,
-	[BNXT_ULP_CLASS_HID_57ea] = 2407,
-	[BNXT_ULP_CLASS_HID_50b6] = 2408,
-	[BNXT_ULP_CLASS_HID_3e6a] = 2409,
-	[BNXT_ULP_CLASS_HID_3b36] = 2410,
-	[BNXT_ULP_CLASS_HID_37c2] = 2411,
-	[BNXT_ULP_CLASS_HID_308e] = 2412,
-	[BNXT_ULP_CLASS_HID_5e06] = 2413,
-	[BNXT_ULP_CLASS_HID_5ad2] = 2414,
-	[BNXT_ULP_CLASS_HID_579e] = 2415,
-	[BNXT_ULP_CLASS_HID_50aa] = 2416,
-	[BNXT_ULP_CLASS_HID_02fa] = 2417,
-	[BNXT_ULP_CLASS_HID_1f86] = 2418,
-	[BNXT_ULP_CLASS_HID_1852] = 2419,
-	[BNXT_ULP_CLASS_HID_151e] = 2420,
-	[BNXT_ULP_CLASS_HID_584e] = 2421,
-	[BNXT_ULP_CLASS_HID_551a] = 2422,
-	[BNXT_ULP_CLASS_HID_2e26] = 2423,
-	[BNXT_ULP_CLASS_HID_2af2] = 2424,
-	[BNXT_ULP_CLASS_HID_38a6] = 2425,
-	[BNXT_ULP_CLASS_HID_3572] = 2426,
-	[BNXT_ULP_CLASS_HID_0e3e] = 2427,
-	[BNXT_ULP_CLASS_HID_0aca] = 2428,
-	[BNXT_ULP_CLASS_HID_5842] = 2429,
-	[BNXT_ULP_CLASS_HID_550e] = 2430,
-	[BNXT_ULP_CLASS_HID_51da] = 2431,
-	[BNXT_ULP_CLASS_HID_2ae6] = 2432,
-	[BNXT_ULP_CLASS_HID_1d36] = 2433,
-	[BNXT_ULP_CLASS_HID_19c2] = 2434,
-	[BNXT_ULP_CLASS_HID_128e] = 2435,
-	[BNXT_ULP_CLASS_HID_4a8e] = 2436,
-	[BNXT_ULP_CLASS_HID_528a] = 2437,
-	[BNXT_ULP_CLASS_HID_2f56] = 2438,
-	[BNXT_ULP_CLASS_HID_2862] = 2439,
-	[BNXT_ULP_CLASS_HID_252e] = 2440,
-	[BNXT_ULP_CLASS_HID_32e2] = 2441,
-	[BNXT_ULP_CLASS_HID_0fae] = 2442,
-	[BNXT_ULP_CLASS_HID_087a] = 2443,
-	[BNXT_ULP_CLASS_HID_0506] = 2444,
-	[BNXT_ULP_CLASS_HID_34b6] = 2445,
-	[BNXT_ULP_CLASS_HID_3a7a] = 2446,
-	[BNXT_ULP_CLASS_HID_5a62] = 2447,
-	[BNXT_ULP_CLASS_HID_545e] = 2448,
-	[BNXT_ULP_CLASS_HID_a73c] = 2449,
-	[BNXT_ULP_CLASS_HID_a040] = 2450,
-	[BNXT_ULP_CLASS_HID_1d640] = 2451,
-	[BNXT_ULP_CLASS_HID_1dd3c] = 2452,
-	[BNXT_ULP_CLASS_HID_cba0] = 2453,
-	[BNXT_ULP_CLASS_HID_c4f4] = 2454,
-	[BNXT_ULP_CLASS_HID_19f38] = 2455,
-	[BNXT_ULP_CLASS_HID_182f4] = 2456,
-	[BNXT_ULP_CLASS_HID_b098] = 2457,
-	[BNXT_ULP_CLASS_HID_8dac] = 2458,
-	[BNXT_ULP_CLASS_HID_1a3ac] = 2459,
-	[BNXT_ULP_CLASS_HID_1a698] = 2460,
-	[BNXT_ULP_CLASS_HID_d50c] = 2461,
-	[BNXT_ULP_CLASS_HID_ae50] = 2462,
-	[BNXT_ULP_CLASS_HID_1c450] = 2463,
-	[BNXT_ULP_CLASS_HID_1cb0c] = 2464,
-	[BNXT_ULP_CLASS_HID_a1f0] = 2465,
-	[BNXT_ULP_CLASS_HID_ba04] = 2466,
-	[BNXT_ULP_CLASS_HID_1d004] = 2467,
-	[BNXT_ULP_CLASS_HID_1d7f0] = 2468,
-	[BNXT_ULP_CLASS_HID_c264] = 2469,
-	[BNXT_ULP_CLASS_HID_dea8] = 2470,
-	[BNXT_ULP_CLASS_HID_199fc] = 2471,
-	[BNXT_ULP_CLASS_HID_19ca8] = 2472,
-	[BNXT_ULP_CLASS_HID_8b5c] = 2473,
-	[BNXT_ULP_CLASS_HID_8460] = 2474,
-	[BNXT_ULP_CLASS_HID_1ba60] = 2475,
-	[BNXT_ULP_CLASS_HID_1a15c] = 2476,
-	[BNXT_ULP_CLASS_HID_afc0] = 2477,
-	[BNXT_ULP_CLASS_HID_a814] = 2478,
-	[BNXT_ULP_CLASS_HID_1de14] = 2479,
-	[BNXT_ULP_CLASS_HID_1c5c0] = 2480,
-	[BNXT_ULP_CLASS_HID_8c2c] = 2481,
-	[BNXT_ULP_CLASS_HID_8970] = 2482,
-	[BNXT_ULP_CLASS_HID_1bf70] = 2483,
-	[BNXT_ULP_CLASS_HID_1a22c] = 2484,
-	[BNXT_ULP_CLASS_HID_d0d0] = 2485,
-	[BNXT_ULP_CLASS_HID_ade4] = 2486,
-	[BNXT_ULP_CLASS_HID_1c3e4] = 2487,
-	[BNXT_ULP_CLASS_HID_1c6d0] = 2488,
-	[BNXT_ULP_CLASS_HID_9988] = 2489,
-	[BNXT_ULP_CLASS_HID_92dc] = 2490,
-	[BNXT_ULP_CLASS_HID_188dc] = 2491,
-	[BNXT_ULP_CLASS_HID_18f88] = 2492,
-	[BNXT_ULP_CLASS_HID_ba3c] = 2493,
-	[BNXT_ULP_CLASS_HID_b740] = 2494,
-	[BNXT_ULP_CLASS_HID_1ad40] = 2495,
-	[BNXT_ULP_CLASS_HID_1d03c] = 2496,
-	[BNXT_ULP_CLASS_HID_86e0] = 2497,
-	[BNXT_ULP_CLASS_HID_8334] = 2498,
-	[BNXT_ULP_CLASS_HID_1b934] = 2499,
-	[BNXT_ULP_CLASS_HID_1bce0] = 2500,
-	[BNXT_ULP_CLASS_HID_aa94] = 2501,
-	[BNXT_ULP_CLASS_HID_a7d8] = 2502,
-	[BNXT_ULP_CLASS_HID_1ddd8] = 2503,
-	[BNXT_ULP_CLASS_HID_1c094] = 2504,
-	[BNXT_ULP_CLASS_HID_904c] = 2505,
-	[BNXT_ULP_CLASS_HID_c84c] = 2506,
-	[BNXT_ULP_CLASS_HID_18290] = 2507,
-	[BNXT_ULP_CLASS_HID_1864c] = 2508,
-	[BNXT_ULP_CLASS_HID_b4f0] = 2509,
-	[BNXT_ULP_CLASS_HID_b104] = 2510,
-	[BNXT_ULP_CLASS_HID_1a704] = 2511,
-	[BNXT_ULP_CLASS_HID_1aaf0] = 2512,
-	[BNXT_ULP_CLASS_HID_80a4] = 2513,
-	[BNXT_ULP_CLASS_HID_9de8] = 2514,
-	[BNXT_ULP_CLASS_HID_1b3e8] = 2515,
-	[BNXT_ULP_CLASS_HID_1b6a4] = 2516,
-	[BNXT_ULP_CLASS_HID_a548] = 2517,
-	[BNXT_ULP_CLASS_HID_a19c] = 2518,
-	[BNXT_ULP_CLASS_HID_1d79c] = 2519,
-	[BNXT_ULP_CLASS_HID_1db48] = 2520,
-	[BNXT_ULP_CLASS_HID_9a98] = 2521,
-	[BNXT_ULP_CLASS_HID_97ac] = 2522,
-	[BNXT_ULP_CLASS_HID_18dac] = 2523,
-	[BNXT_ULP_CLASS_HID_1b098] = 2524,
-	[BNXT_ULP_CLASS_HID_bf0c] = 2525,
-	[BNXT_ULP_CLASS_HID_b850] = 2526,
-	[BNXT_ULP_CLASS_HID_1ae50] = 2527,
-	[BNXT_ULP_CLASS_HID_1d50c] = 2528,
-	[BNXT_ULP_CLASS_HID_34f0] = 2529,
-	[BNXT_ULP_CLASS_HID_3a3c] = 2530,
-	[BNXT_ULP_CLASS_HID_3740] = 2531,
-	[BNXT_ULP_CLASS_HID_5ea0] = 2532,
-	[BNXT_ULP_CLASS_HID_5bf4] = 2533,
-	[BNXT_ULP_CLASS_HID_0798] = 2534,
-	[BNXT_ULP_CLASS_HID_00ac] = 2535,
-	[BNXT_ULP_CLASS_HID_280c] = 2536,
-	[BNXT_ULP_CLASS_HID_2550] = 2537,
-	[BNXT_ULP_CLASS_HID_3104] = 2538,
-	[BNXT_ULP_CLASS_HID_5964] = 2539,
-	[BNXT_ULP_CLASS_HID_55a8] = 2540,
-	[BNXT_ULP_CLASS_HID_1e5c] = 2541,
-	[BNXT_ULP_CLASS_HID_1b60] = 2542,
-	[BNXT_ULP_CLASS_HID_22c0] = 2543,
-	[BNXT_ULP_CLASS_HID_3f14] = 2544,
-	[BNXT_ULP_CLASS_HID_a71c] = 2545,
-	[BNXT_ULP_CLASS_HID_a8dc] = 2546,
-	[BNXT_ULP_CLASS_HID_ed9c] = 2547,
-	[BNXT_ULP_CLASS_HID_ef5c] = 2548,
-	[BNXT_ULP_CLASS_HID_a060] = 2549,
-	[BNXT_ULP_CLASS_HID_a520] = 2550,
-	[BNXT_ULP_CLASS_HID_e6e0] = 2551,
-	[BNXT_ULP_CLASS_HID_eba0] = 2552,
-	[BNXT_ULP_CLASS_HID_1d660] = 2553,
-	[BNXT_ULP_CLASS_HID_1fb20] = 2554,
-	[BNXT_ULP_CLASS_HID_1dce0] = 2555,
-	[BNXT_ULP_CLASS_HID_1e1a0] = 2556,
-	[BNXT_ULP_CLASS_HID_1dd1c] = 2557,
-	[BNXT_ULP_CLASS_HID_1fedc] = 2558,
-	[BNXT_ULP_CLASS_HID_1c39c] = 2559,
-	[BNXT_ULP_CLASS_HID_1e55c] = 2560,
-	[BNXT_ULP_CLASS_HID_cb80] = 2561,
-	[BNXT_ULP_CLASS_HID_b194] = 2562,
-	[BNXT_ULP_CLASS_HID_d354] = 2563,
-	[BNXT_ULP_CLASS_HID_f414] = 2564,
-	[BNXT_ULP_CLASS_HID_c4d4] = 2565,
-	[BNXT_ULP_CLASS_HID_e994] = 2566,
-	[BNXT_ULP_CLASS_HID_cb54] = 2567,
-	[BNXT_ULP_CLASS_HID_f158] = 2568,
-	[BNXT_ULP_CLASS_HID_19f18] = 2569,
-	[BNXT_ULP_CLASS_HID_1a0d8] = 2570,
-	[BNXT_ULP_CLASS_HID_1c598] = 2571,
-	[BNXT_ULP_CLASS_HID_1e758] = 2572,
-	[BNXT_ULP_CLASS_HID_182d4] = 2573,
-	[BNXT_ULP_CLASS_HID_1a794] = 2574,
-	[BNXT_ULP_CLASS_HID_1c954] = 2575,
-	[BNXT_ULP_CLASS_HID_1ea14] = 2576,
-	[BNXT_ULP_CLASS_HID_b0b8] = 2577,
-	[BNXT_ULP_CLASS_HID_b278] = 2578,
-	[BNXT_ULP_CLASS_HID_f738] = 2579,
-	[BNXT_ULP_CLASS_HID_f8f8] = 2580,
-	[BNXT_ULP_CLASS_HID_8d8c] = 2581,
-	[BNXT_ULP_CLASS_HID_af4c] = 2582,
-	[BNXT_ULP_CLASS_HID_f00c] = 2583,
-	[BNXT_ULP_CLASS_HID_f5cc] = 2584,
-	[BNXT_ULP_CLASS_HID_1a38c] = 2585,
-	[BNXT_ULP_CLASS_HID_1a54c] = 2586,
-	[BNXT_ULP_CLASS_HID_1e60c] = 2587,
-	[BNXT_ULP_CLASS_HID_1ebcc] = 2588,
-	[BNXT_ULP_CLASS_HID_1a6b8] = 2589,
-	[BNXT_ULP_CLASS_HID_1a878] = 2590,
-	[BNXT_ULP_CLASS_HID_1ed38] = 2591,
-	[BNXT_ULP_CLASS_HID_1eef8] = 2592,
-	[BNXT_ULP_CLASS_HID_d52c] = 2593,
-	[BNXT_ULP_CLASS_HID_f6ec] = 2594,
-	[BNXT_ULP_CLASS_HID_dbac] = 2595,
-	[BNXT_ULP_CLASS_HID_fd6c] = 2596,
-	[BNXT_ULP_CLASS_HID_ae70] = 2597,
-	[BNXT_ULP_CLASS_HID_f330] = 2598,
-	[BNXT_ULP_CLASS_HID_d4f0] = 2599,
-	[BNXT_ULP_CLASS_HID_f9b0] = 2600,
-	[BNXT_ULP_CLASS_HID_1c470] = 2601,
-	[BNXT_ULP_CLASS_HID_1e930] = 2602,
-	[BNXT_ULP_CLASS_HID_1caf0] = 2603,
-	[BNXT_ULP_CLASS_HID_1f084] = 2604,
-	[BNXT_ULP_CLASS_HID_1cb2c] = 2605,
-	[BNXT_ULP_CLASS_HID_1b130] = 2606,
-	[BNXT_ULP_CLASS_HID_1d2f0] = 2607,
-	[BNXT_ULP_CLASS_HID_1f7b0] = 2608,
-	[BNXT_ULP_CLASS_HID_a1d0] = 2609,
-	[BNXT_ULP_CLASS_HID_a290] = 2610,
-	[BNXT_ULP_CLASS_HID_e450] = 2611,
-	[BNXT_ULP_CLASS_HID_e910] = 2612,
-	[BNXT_ULP_CLASS_HID_ba24] = 2613,
-	[BNXT_ULP_CLASS_HID_bfe4] = 2614,
-	[BNXT_ULP_CLASS_HID_e0a4] = 2615,
-	[BNXT_ULP_CLASS_HID_e264] = 2616,
-	[BNXT_ULP_CLASS_HID_1d024] = 2617,
-	[BNXT_ULP_CLASS_HID_1f5e4] = 2618,
-	[BNXT_ULP_CLASS_HID_1d6a4] = 2619,
-	[BNXT_ULP_CLASS_HID_1f864] = 2620,
-	[BNXT_ULP_CLASS_HID_1d7d0] = 2621,
-	[BNXT_ULP_CLASS_HID_1f890] = 2622,
-	[BNXT_ULP_CLASS_HID_1da50] = 2623,
-	[BNXT_ULP_CLASS_HID_1ff10] = 2624,
-	[BNXT_ULP_CLASS_HID_c244] = 2625,
-	[BNXT_ULP_CLASS_HID_e704] = 2626,
-	[BNXT_ULP_CLASS_HID_c8c4] = 2627,
-	[BNXT_ULP_CLASS_HID_ed84] = 2628,
-	[BNXT_ULP_CLASS_HID_de88] = 2629,
-	[BNXT_ULP_CLASS_HID_e048] = 2630,
-	[BNXT_ULP_CLASS_HID_c508] = 2631,
-	[BNXT_ULP_CLASS_HID_e6c8] = 2632,
-	[BNXT_ULP_CLASS_HID_199dc] = 2633,
-	[BNXT_ULP_CLASS_HID_1ba9c] = 2634,
-	[BNXT_ULP_CLASS_HID_1dc5c] = 2635,
-	[BNXT_ULP_CLASS_HID_1e11c] = 2636,
-	[BNXT_ULP_CLASS_HID_19c88] = 2637,
-	[BNXT_ULP_CLASS_HID_1be48] = 2638,
-	[BNXT_ULP_CLASS_HID_1c308] = 2639,
-	[BNXT_ULP_CLASS_HID_1e4c8] = 2640,
-	[BNXT_ULP_CLASS_HID_8b7c] = 2641,
-	[BNXT_ULP_CLASS_HID_ac3c] = 2642,
-	[BNXT_ULP_CLASS_HID_f1fc] = 2643,
-	[BNXT_ULP_CLASS_HID_f2bc] = 2644,
-	[BNXT_ULP_CLASS_HID_8440] = 2645,
-	[BNXT_ULP_CLASS_HID_a900] = 2646,
-	[BNXT_ULP_CLASS_HID_cac0] = 2647,
-	[BNXT_ULP_CLASS_HID_ef80] = 2648,
-	[BNXT_ULP_CLASS_HID_1ba40] = 2649,
-	[BNXT_ULP_CLASS_HID_1bf00] = 2650,
-	[BNXT_ULP_CLASS_HID_1e0c0] = 2651,
-	[BNXT_ULP_CLASS_HID_1e580] = 2652,
-	[BNXT_ULP_CLASS_HID_1a17c] = 2653,
-	[BNXT_ULP_CLASS_HID_1a23c] = 2654,
-	[BNXT_ULP_CLASS_HID_1e7fc] = 2655,
-	[BNXT_ULP_CLASS_HID_1e8bc] = 2656,
-	[BNXT_ULP_CLASS_HID_afe0] = 2657,
-	[BNXT_ULP_CLASS_HID_f0a0] = 2658,
-	[BNXT_ULP_CLASS_HID_d260] = 2659,
-	[BNXT_ULP_CLASS_HID_f720] = 2660,
-	[BNXT_ULP_CLASS_HID_a834] = 2661,
-	[BNXT_ULP_CLASS_HID_adf4] = 2662,
-	[BNXT_ULP_CLASS_HID_eeb4] = 2663,
-	[BNXT_ULP_CLASS_HID_f074] = 2664,
-	[BNXT_ULP_CLASS_HID_1de34] = 2665,
-	[BNXT_ULP_CLASS_HID_1e3f4] = 2666,
-	[BNXT_ULP_CLASS_HID_1c4b4] = 2667,
-	[BNXT_ULP_CLASS_HID_1e674] = 2668,
-	[BNXT_ULP_CLASS_HID_1c5e0] = 2669,
-	[BNXT_ULP_CLASS_HID_1e6a0] = 2670,
-	[BNXT_ULP_CLASS_HID_1c860] = 2671,
-	[BNXT_ULP_CLASS_HID_1ed20] = 2672,
-	[BNXT_ULP_CLASS_HID_8c0c] = 2673,
-	[BNXT_ULP_CLASS_HID_b1cc] = 2674,
-	[BNXT_ULP_CLASS_HID_f28c] = 2675,
-	[BNXT_ULP_CLASS_HID_f44c] = 2676,
-	[BNXT_ULP_CLASS_HID_8950] = 2677,
-	[BNXT_ULP_CLASS_HID_aa10] = 2678,
-	[BNXT_ULP_CLASS_HID_cfd0] = 2679,
-	[BNXT_ULP_CLASS_HID_f090] = 2680,
-	[BNXT_ULP_CLASS_HID_1bf50] = 2681,
-	[BNXT_ULP_CLASS_HID_1a010] = 2682,
-	[BNXT_ULP_CLASS_HID_1e5d0] = 2683,
-	[BNXT_ULP_CLASS_HID_1e690] = 2684,
-	[BNXT_ULP_CLASS_HID_1a20c] = 2685,
-	[BNXT_ULP_CLASS_HID_1a7cc] = 2686,
-	[BNXT_ULP_CLASS_HID_1e88c] = 2687,
-	[BNXT_ULP_CLASS_HID_1ea4c] = 2688,
-	[BNXT_ULP_CLASS_HID_d0f0] = 2689,
-	[BNXT_ULP_CLASS_HID_f5b0] = 2690,
-	[BNXT_ULP_CLASS_HID_d770] = 2691,
-	[BNXT_ULP_CLASS_HID_f830] = 2692,
-	[BNXT_ULP_CLASS_HID_adc4] = 2693,
-	[BNXT_ULP_CLASS_HID_ae84] = 2694,
-	[BNXT_ULP_CLASS_HID_d044] = 2695,
-	[BNXT_ULP_CLASS_HID_f504] = 2696,
-	[BNXT_ULP_CLASS_HID_1c3c4] = 2697,
-	[BNXT_ULP_CLASS_HID_1e484] = 2698,
-	[BNXT_ULP_CLASS_HID_1c644] = 2699,
-	[BNXT_ULP_CLASS_HID_1eb04] = 2700,
-	[BNXT_ULP_CLASS_HID_1c6f0] = 2701,
-	[BNXT_ULP_CLASS_HID_1ebb0] = 2702,
-	[BNXT_ULP_CLASS_HID_1cd70] = 2703,
-	[BNXT_ULP_CLASS_HID_1f304] = 2704,
-	[BNXT_ULP_CLASS_HID_99a8] = 2705,
-	[BNXT_ULP_CLASS_HID_bb68] = 2706,
-	[BNXT_ULP_CLASS_HID_dc28] = 2707,
-	[BNXT_ULP_CLASS_HID_e1e8] = 2708,
-	[BNXT_ULP_CLASS_HID_92fc] = 2709,
-	[BNXT_ULP_CLASS_HID_b7bc] = 2710,
-	[BNXT_ULP_CLASS_HID_d97c] = 2711,
-	[BNXT_ULP_CLASS_HID_fa3c] = 2712,
-	[BNXT_ULP_CLASS_HID_188fc] = 2713,
-	[BNXT_ULP_CLASS_HID_1adbc] = 2714,
-	[BNXT_ULP_CLASS_HID_1cf7c] = 2715,
-	[BNXT_ULP_CLASS_HID_1f03c] = 2716,
-	[BNXT_ULP_CLASS_HID_18fa8] = 2717,
-	[BNXT_ULP_CLASS_HID_1b168] = 2718,
-	[BNXT_ULP_CLASS_HID_1f228] = 2719,
-	[BNXT_ULP_CLASS_HID_1f7e8] = 2720,
-	[BNXT_ULP_CLASS_HID_ba1c] = 2721,
-	[BNXT_ULP_CLASS_HID_bfdc] = 2722,
-	[BNXT_ULP_CLASS_HID_e09c] = 2723,
-	[BNXT_ULP_CLASS_HID_e25c] = 2724,
-	[BNXT_ULP_CLASS_HID_b760] = 2725,
-	[BNXT_ULP_CLASS_HID_b820] = 2726,
-	[BNXT_ULP_CLASS_HID_fde0] = 2727,
-	[BNXT_ULP_CLASS_HID_fea0] = 2728,
-	[BNXT_ULP_CLASS_HID_1ad60] = 2729,
-	[BNXT_ULP_CLASS_HID_1ae20] = 2730,
-	[BNXT_ULP_CLASS_HID_1d3e0] = 2731,
-	[BNXT_ULP_CLASS_HID_1f4a0] = 2732,
-	[BNXT_ULP_CLASS_HID_1d01c] = 2733,
-	[BNXT_ULP_CLASS_HID_1f5dc] = 2734,
-	[BNXT_ULP_CLASS_HID_1d69c] = 2735,
-	[BNXT_ULP_CLASS_HID_1f85c] = 2736,
-	[BNXT_ULP_CLASS_HID_86c0] = 2737,
-	[BNXT_ULP_CLASS_HID_ab80] = 2738,
-	[BNXT_ULP_CLASS_HID_cd40] = 2739,
-	[BNXT_ULP_CLASS_HID_ee00] = 2740,
-	[BNXT_ULP_CLASS_HID_8314] = 2741,
-	[BNXT_ULP_CLASS_HID_a4d4] = 2742,
-	[BNXT_ULP_CLASS_HID_c994] = 2743,
-	[BNXT_ULP_CLASS_HID_eb54] = 2744,
-	[BNXT_ULP_CLASS_HID_1b914] = 2745,
-	[BNXT_ULP_CLASS_HID_1bad4] = 2746,
-	[BNXT_ULP_CLASS_HID_1ff94] = 2747,
-	[BNXT_ULP_CLASS_HID_1e154] = 2748,
-	[BNXT_ULP_CLASS_HID_1bcc0] = 2749,
-	[BNXT_ULP_CLASS_HID_1a180] = 2750,
-	[BNXT_ULP_CLASS_HID_1e340] = 2751,
-	[BNXT_ULP_CLASS_HID_1e400] = 2752,
-	[BNXT_ULP_CLASS_HID_aab4] = 2753,
-	[BNXT_ULP_CLASS_HID_ac74] = 2754,
-	[BNXT_ULP_CLASS_HID_d134] = 2755,
-	[BNXT_ULP_CLASS_HID_f2f4] = 2756,
-	[BNXT_ULP_CLASS_HID_a7f8] = 2757,
-	[BNXT_ULP_CLASS_HID_a8b8] = 2758,
-	[BNXT_ULP_CLASS_HID_ea78] = 2759,
-	[BNXT_ULP_CLASS_HID_ef38] = 2760,
-	[BNXT_ULP_CLASS_HID_1ddf8] = 2761,
-	[BNXT_ULP_CLASS_HID_1feb8] = 2762,
-	[BNXT_ULP_CLASS_HID_1c078] = 2763,
-	[BNXT_ULP_CLASS_HID_1e538] = 2764,
-	[BNXT_ULP_CLASS_HID_1c0b4] = 2765,
-	[BNXT_ULP_CLASS_HID_1e274] = 2766,
-	[BNXT_ULP_CLASS_HID_1c734] = 2767,
-	[BNXT_ULP_CLASS_HID_1e8f4] = 2768,
-	[BNXT_ULP_CLASS_HID_906c] = 2769,
-	[BNXT_ULP_CLASS_HID_b52c] = 2770,
-	[BNXT_ULP_CLASS_HID_d6ec] = 2771,
-	[BNXT_ULP_CLASS_HID_fbac] = 2772,
-	[BNXT_ULP_CLASS_HID_c86c] = 2773,
-	[BNXT_ULP_CLASS_HID_ed2c] = 2774,
-	[BNXT_ULP_CLASS_HID_d330] = 2775,
-	[BNXT_ULP_CLASS_HID_f4f0] = 2776,
-	[BNXT_ULP_CLASS_HID_182b0] = 2777,
-	[BNXT_ULP_CLASS_HID_1a470] = 2778,
-	[BNXT_ULP_CLASS_HID_1c930] = 2779,
-	[BNXT_ULP_CLASS_HID_1eaf0] = 2780,
-	[BNXT_ULP_CLASS_HID_1866c] = 2781,
-	[BNXT_ULP_CLASS_HID_1ab2c] = 2782,
-	[BNXT_ULP_CLASS_HID_1ccec] = 2783,
-	[BNXT_ULP_CLASS_HID_1f1ac] = 2784,
-	[BNXT_ULP_CLASS_HID_b4d0] = 2785,
-	[BNXT_ULP_CLASS_HID_b990] = 2786,
-	[BNXT_ULP_CLASS_HID_fb50] = 2787,
-	[BNXT_ULP_CLASS_HID_fc10] = 2788,
-	[BNXT_ULP_CLASS_HID_b124] = 2789,
-	[BNXT_ULP_CLASS_HID_b2e4] = 2790,
-	[BNXT_ULP_CLASS_HID_f7a4] = 2791,
-	[BNXT_ULP_CLASS_HID_f964] = 2792,
-	[BNXT_ULP_CLASS_HID_1a724] = 2793,
-	[BNXT_ULP_CLASS_HID_1a8e4] = 2794,
-	[BNXT_ULP_CLASS_HID_1eda4] = 2795,
-	[BNXT_ULP_CLASS_HID_1ef64] = 2796,
-	[BNXT_ULP_CLASS_HID_1aad0] = 2797,
-	[BNXT_ULP_CLASS_HID_1af90] = 2798,
-	[BNXT_ULP_CLASS_HID_1d150] = 2799,
-	[BNXT_ULP_CLASS_HID_1f210] = 2800,
-	[BNXT_ULP_CLASS_HID_8084] = 2801,
-	[BNXT_ULP_CLASS_HID_a244] = 2802,
-	[BNXT_ULP_CLASS_HID_c704] = 2803,
-	[BNXT_ULP_CLASS_HID_e8c4] = 2804,
-	[BNXT_ULP_CLASS_HID_9dc8] = 2805,
-	[BNXT_ULP_CLASS_HID_be88] = 2806,
-	[BNXT_ULP_CLASS_HID_c048] = 2807,
-	[BNXT_ULP_CLASS_HID_e508] = 2808,
-	[BNXT_ULP_CLASS_HID_1b3c8] = 2809,
-	[BNXT_ULP_CLASS_HID_1b488] = 2810,
-	[BNXT_ULP_CLASS_HID_1f648] = 2811,
-	[BNXT_ULP_CLASS_HID_1fb08] = 2812,
-	[BNXT_ULP_CLASS_HID_1b684] = 2813,
-	[BNXT_ULP_CLASS_HID_1b844] = 2814,
-	[BNXT_ULP_CLASS_HID_1fd04] = 2815,
-	[BNXT_ULP_CLASS_HID_1fec4] = 2816,
-	[BNXT_ULP_CLASS_HID_a568] = 2817,
-	[BNXT_ULP_CLASS_HID_a628] = 2818,
-	[BNXT_ULP_CLASS_HID_ebe8] = 2819,
-	[BNXT_ULP_CLASS_HID_eca8] = 2820,
-	[BNXT_ULP_CLASS_HID_a1bc] = 2821,
-	[BNXT_ULP_CLASS_HID_a37c] = 2822,
-	[BNXT_ULP_CLASS_HID_e43c] = 2823,
-	[BNXT_ULP_CLASS_HID_e9fc] = 2824,
-	[BNXT_ULP_CLASS_HID_1d7bc] = 2825,
-	[BNXT_ULP_CLASS_HID_1f97c] = 2826,
-	[BNXT_ULP_CLASS_HID_1da3c] = 2827,
-	[BNXT_ULP_CLASS_HID_1fffc] = 2828,
-	[BNXT_ULP_CLASS_HID_1db68] = 2829,
-	[BNXT_ULP_CLASS_HID_1fc28] = 2830,
-	[BNXT_ULP_CLASS_HID_1c1e8] = 2831,
-	[BNXT_ULP_CLASS_HID_1e2a8] = 2832,
-	[BNXT_ULP_CLASS_HID_9ab8] = 2833,
-	[BNXT_ULP_CLASS_HID_bc78] = 2834,
-	[BNXT_ULP_CLASS_HID_c138] = 2835,
-	[BNXT_ULP_CLASS_HID_e2f8] = 2836,
-	[BNXT_ULP_CLASS_HID_978c] = 2837,
-	[BNXT_ULP_CLASS_HID_b94c] = 2838,
-	[BNXT_ULP_CLASS_HID_da0c] = 2839,
-	[BNXT_ULP_CLASS_HID_ffcc] = 2840,
-	[BNXT_ULP_CLASS_HID_18d8c] = 2841,
-	[BNXT_ULP_CLASS_HID_1af4c] = 2842,
-	[BNXT_ULP_CLASS_HID_1f00c] = 2843,
-	[BNXT_ULP_CLASS_HID_1f5cc] = 2844,
-	[BNXT_ULP_CLASS_HID_1b0b8] = 2845,
-	[BNXT_ULP_CLASS_HID_1b278] = 2846,
-	[BNXT_ULP_CLASS_HID_1f738] = 2847,
-	[BNXT_ULP_CLASS_HID_1f8f8] = 2848,
-	[BNXT_ULP_CLASS_HID_bf2c] = 2849,
-	[BNXT_ULP_CLASS_HID_a0ec] = 2850,
-	[BNXT_ULP_CLASS_HID_e5ac] = 2851,
-	[BNXT_ULP_CLASS_HID_e76c] = 2852,
-	[BNXT_ULP_CLASS_HID_b870] = 2853,
-	[BNXT_ULP_CLASS_HID_bd30] = 2854,
-	[BNXT_ULP_CLASS_HID_fef0] = 2855,
-	[BNXT_ULP_CLASS_HID_e3b0] = 2856,
-	[BNXT_ULP_CLASS_HID_1ae70] = 2857,
-	[BNXT_ULP_CLASS_HID_1f330] = 2858,
-	[BNXT_ULP_CLASS_HID_1d4f0] = 2859,
-	[BNXT_ULP_CLASS_HID_1f9b0] = 2860,
-	[BNXT_ULP_CLASS_HID_1d52c] = 2861,
-	[BNXT_ULP_CLASS_HID_1f6ec] = 2862,
-	[BNXT_ULP_CLASS_HID_1dbac] = 2863,
-	[BNXT_ULP_CLASS_HID_1fd6c] = 2864,
-	[BNXT_ULP_CLASS_HID_34d0] = 2865,
-	[BNXT_ULP_CLASS_HID_3a1c] = 2866,
-	[BNXT_ULP_CLASS_HID_3760] = 2867,
-	[BNXT_ULP_CLASS_HID_5e80] = 2868,
-	[BNXT_ULP_CLASS_HID_5bd4] = 2869,
-	[BNXT_ULP_CLASS_HID_07b8] = 2870,
-	[BNXT_ULP_CLASS_HID_008c] = 2871,
-	[BNXT_ULP_CLASS_HID_282c] = 2872,
-	[BNXT_ULP_CLASS_HID_2570] = 2873,
-	[BNXT_ULP_CLASS_HID_3124] = 2874,
-	[BNXT_ULP_CLASS_HID_5944] = 2875,
-	[BNXT_ULP_CLASS_HID_5588] = 2876,
-	[BNXT_ULP_CLASS_HID_1e7c] = 2877,
-	[BNXT_ULP_CLASS_HID_1b40] = 2878,
-	[BNXT_ULP_CLASS_HID_22e0] = 2879,
-	[BNXT_ULP_CLASS_HID_3f34] = 2880,
-	[BNXT_ULP_CLASS_HID_a77c] = 2881,
-	[BNXT_ULP_CLASS_HID_a8bc] = 2882,
-	[BNXT_ULP_CLASS_HID_edfc] = 2883,
-	[BNXT_ULP_CLASS_HID_ef3c] = 2884,
-	[BNXT_ULP_CLASS_HID_a000] = 2885,
-	[BNXT_ULP_CLASS_HID_a540] = 2886,
-	[BNXT_ULP_CLASS_HID_e680] = 2887,
-	[BNXT_ULP_CLASS_HID_ebc0] = 2888,
-	[BNXT_ULP_CLASS_HID_1d600] = 2889,
-	[BNXT_ULP_CLASS_HID_1fb40] = 2890,
-	[BNXT_ULP_CLASS_HID_1dc80] = 2891,
-	[BNXT_ULP_CLASS_HID_1e1c0] = 2892,
-	[BNXT_ULP_CLASS_HID_1dd7c] = 2893,
-	[BNXT_ULP_CLASS_HID_1febc] = 2894,
-	[BNXT_ULP_CLASS_HID_1c3fc] = 2895,
-	[BNXT_ULP_CLASS_HID_1e53c] = 2896,
-	[BNXT_ULP_CLASS_HID_cbe0] = 2897,
-	[BNXT_ULP_CLASS_HID_b1f4] = 2898,
-	[BNXT_ULP_CLASS_HID_d334] = 2899,
-	[BNXT_ULP_CLASS_HID_f474] = 2900,
-	[BNXT_ULP_CLASS_HID_c4b4] = 2901,
-	[BNXT_ULP_CLASS_HID_e9f4] = 2902,
-	[BNXT_ULP_CLASS_HID_cb34] = 2903,
-	[BNXT_ULP_CLASS_HID_f138] = 2904,
-	[BNXT_ULP_CLASS_HID_19f78] = 2905,
-	[BNXT_ULP_CLASS_HID_1a0b8] = 2906,
-	[BNXT_ULP_CLASS_HID_1c5f8] = 2907,
-	[BNXT_ULP_CLASS_HID_1e738] = 2908,
-	[BNXT_ULP_CLASS_HID_182b4] = 2909,
-	[BNXT_ULP_CLASS_HID_1a7f4] = 2910,
-	[BNXT_ULP_CLASS_HID_1c934] = 2911,
-	[BNXT_ULP_CLASS_HID_1ea74] = 2912,
-	[BNXT_ULP_CLASS_HID_b0d8] = 2913,
-	[BNXT_ULP_CLASS_HID_b218] = 2914,
-	[BNXT_ULP_CLASS_HID_f758] = 2915,
-	[BNXT_ULP_CLASS_HID_f898] = 2916,
-	[BNXT_ULP_CLASS_HID_8dec] = 2917,
-	[BNXT_ULP_CLASS_HID_af2c] = 2918,
-	[BNXT_ULP_CLASS_HID_f06c] = 2919,
-	[BNXT_ULP_CLASS_HID_f5ac] = 2920,
-	[BNXT_ULP_CLASS_HID_1a3ec] = 2921,
-	[BNXT_ULP_CLASS_HID_1a52c] = 2922,
-	[BNXT_ULP_CLASS_HID_1e66c] = 2923,
-	[BNXT_ULP_CLASS_HID_1ebac] = 2924,
-	[BNXT_ULP_CLASS_HID_1a6d8] = 2925,
-	[BNXT_ULP_CLASS_HID_1a818] = 2926,
-	[BNXT_ULP_CLASS_HID_1ed58] = 2927,
-	[BNXT_ULP_CLASS_HID_1ee98] = 2928,
-	[BNXT_ULP_CLASS_HID_d54c] = 2929,
-	[BNXT_ULP_CLASS_HID_f68c] = 2930,
-	[BNXT_ULP_CLASS_HID_dbcc] = 2931,
-	[BNXT_ULP_CLASS_HID_fd0c] = 2932,
-	[BNXT_ULP_CLASS_HID_ae10] = 2933,
-	[BNXT_ULP_CLASS_HID_f350] = 2934,
-	[BNXT_ULP_CLASS_HID_d490] = 2935,
-	[BNXT_ULP_CLASS_HID_f9d0] = 2936,
-	[BNXT_ULP_CLASS_HID_1c410] = 2937,
-	[BNXT_ULP_CLASS_HID_1e950] = 2938,
-	[BNXT_ULP_CLASS_HID_1ca90] = 2939,
-	[BNXT_ULP_CLASS_HID_1f0e4] = 2940,
-	[BNXT_ULP_CLASS_HID_1cb4c] = 2941,
-	[BNXT_ULP_CLASS_HID_1b150] = 2942,
-	[BNXT_ULP_CLASS_HID_1d290] = 2943,
-	[BNXT_ULP_CLASS_HID_1f7d0] = 2944,
-	[BNXT_ULP_CLASS_HID_a1b0] = 2945,
-	[BNXT_ULP_CLASS_HID_a2f0] = 2946,
-	[BNXT_ULP_CLASS_HID_e430] = 2947,
-	[BNXT_ULP_CLASS_HID_e970] = 2948,
-	[BNXT_ULP_CLASS_HID_ba44] = 2949,
-	[BNXT_ULP_CLASS_HID_bf84] = 2950,
-	[BNXT_ULP_CLASS_HID_e0c4] = 2951,
-	[BNXT_ULP_CLASS_HID_e204] = 2952,
-	[BNXT_ULP_CLASS_HID_1d044] = 2953,
-	[BNXT_ULP_CLASS_HID_1f584] = 2954,
-	[BNXT_ULP_CLASS_HID_1d6c4] = 2955,
-	[BNXT_ULP_CLASS_HID_1f804] = 2956,
-	[BNXT_ULP_CLASS_HID_1d7b0] = 2957,
-	[BNXT_ULP_CLASS_HID_1f8f0] = 2958,
-	[BNXT_ULP_CLASS_HID_1da30] = 2959,
-	[BNXT_ULP_CLASS_HID_1ff70] = 2960,
-	[BNXT_ULP_CLASS_HID_c224] = 2961,
-	[BNXT_ULP_CLASS_HID_e764] = 2962,
-	[BNXT_ULP_CLASS_HID_c8a4] = 2963,
-	[BNXT_ULP_CLASS_HID_ede4] = 2964,
-	[BNXT_ULP_CLASS_HID_dee8] = 2965,
-	[BNXT_ULP_CLASS_HID_e028] = 2966,
-	[BNXT_ULP_CLASS_HID_c568] = 2967,
-	[BNXT_ULP_CLASS_HID_e6a8] = 2968,
-	[BNXT_ULP_CLASS_HID_199bc] = 2969,
-	[BNXT_ULP_CLASS_HID_1bafc] = 2970,
-	[BNXT_ULP_CLASS_HID_1dc3c] = 2971,
-	[BNXT_ULP_CLASS_HID_1e17c] = 2972,
-	[BNXT_ULP_CLASS_HID_19ce8] = 2973,
-	[BNXT_ULP_CLASS_HID_1be28] = 2974,
-	[BNXT_ULP_CLASS_HID_1c368] = 2975,
-	[BNXT_ULP_CLASS_HID_1e4a8] = 2976,
-	[BNXT_ULP_CLASS_HID_8b1c] = 2977,
-	[BNXT_ULP_CLASS_HID_ac5c] = 2978,
-	[BNXT_ULP_CLASS_HID_f19c] = 2979,
-	[BNXT_ULP_CLASS_HID_f2dc] = 2980,
-	[BNXT_ULP_CLASS_HID_8420] = 2981,
-	[BNXT_ULP_CLASS_HID_a960] = 2982,
-	[BNXT_ULP_CLASS_HID_caa0] = 2983,
-	[BNXT_ULP_CLASS_HID_efe0] = 2984,
-	[BNXT_ULP_CLASS_HID_1ba20] = 2985,
-	[BNXT_ULP_CLASS_HID_1bf60] = 2986,
-	[BNXT_ULP_CLASS_HID_1e0a0] = 2987,
-	[BNXT_ULP_CLASS_HID_1e5e0] = 2988,
-	[BNXT_ULP_CLASS_HID_1a11c] = 2989,
-	[BNXT_ULP_CLASS_HID_1a25c] = 2990,
-	[BNXT_ULP_CLASS_HID_1e79c] = 2991,
-	[BNXT_ULP_CLASS_HID_1e8dc] = 2992,
-	[BNXT_ULP_CLASS_HID_af80] = 2993,
-	[BNXT_ULP_CLASS_HID_f0c0] = 2994,
-	[BNXT_ULP_CLASS_HID_d200] = 2995,
-	[BNXT_ULP_CLASS_HID_f740] = 2996,
-	[BNXT_ULP_CLASS_HID_a854] = 2997,
-	[BNXT_ULP_CLASS_HID_ad94] = 2998,
-	[BNXT_ULP_CLASS_HID_eed4] = 2999,
-	[BNXT_ULP_CLASS_HID_f014] = 3000,
-	[BNXT_ULP_CLASS_HID_1de54] = 3001,
-	[BNXT_ULP_CLASS_HID_1e394] = 3002,
-	[BNXT_ULP_CLASS_HID_1c4d4] = 3003,
-	[BNXT_ULP_CLASS_HID_1e614] = 3004,
-	[BNXT_ULP_CLASS_HID_1c580] = 3005,
-	[BNXT_ULP_CLASS_HID_1e6c0] = 3006,
-	[BNXT_ULP_CLASS_HID_1c800] = 3007,
-	[BNXT_ULP_CLASS_HID_1ed40] = 3008,
-	[BNXT_ULP_CLASS_HID_8c6c] = 3009,
-	[BNXT_ULP_CLASS_HID_b1ac] = 3010,
-	[BNXT_ULP_CLASS_HID_f2ec] = 3011,
-	[BNXT_ULP_CLASS_HID_f42c] = 3012,
-	[BNXT_ULP_CLASS_HID_8930] = 3013,
-	[BNXT_ULP_CLASS_HID_aa70] = 3014,
-	[BNXT_ULP_CLASS_HID_cfb0] = 3015,
-	[BNXT_ULP_CLASS_HID_f0f0] = 3016,
-	[BNXT_ULP_CLASS_HID_1bf30] = 3017,
-	[BNXT_ULP_CLASS_HID_1a070] = 3018,
-	[BNXT_ULP_CLASS_HID_1e5b0] = 3019,
-	[BNXT_ULP_CLASS_HID_1e6f0] = 3020,
-	[BNXT_ULP_CLASS_HID_1a26c] = 3021,
-	[BNXT_ULP_CLASS_HID_1a7ac] = 3022,
-	[BNXT_ULP_CLASS_HID_1e8ec] = 3023,
-	[BNXT_ULP_CLASS_HID_1ea2c] = 3024,
-	[BNXT_ULP_CLASS_HID_d090] = 3025,
-	[BNXT_ULP_CLASS_HID_f5d0] = 3026,
-	[BNXT_ULP_CLASS_HID_d710] = 3027,
-	[BNXT_ULP_CLASS_HID_f850] = 3028,
-	[BNXT_ULP_CLASS_HID_ada4] = 3029,
-	[BNXT_ULP_CLASS_HID_aee4] = 3030,
-	[BNXT_ULP_CLASS_HID_d024] = 3031,
-	[BNXT_ULP_CLASS_HID_f564] = 3032,
-	[BNXT_ULP_CLASS_HID_1c3a4] = 3033,
-	[BNXT_ULP_CLASS_HID_1e4e4] = 3034,
-	[BNXT_ULP_CLASS_HID_1c624] = 3035,
-	[BNXT_ULP_CLASS_HID_1eb64] = 3036,
-	[BNXT_ULP_CLASS_HID_1c690] = 3037,
-	[BNXT_ULP_CLASS_HID_1ebd0] = 3038,
-	[BNXT_ULP_CLASS_HID_1cd10] = 3039,
-	[BNXT_ULP_CLASS_HID_1f364] = 3040,
-	[BNXT_ULP_CLASS_HID_99c8] = 3041,
-	[BNXT_ULP_CLASS_HID_bb08] = 3042,
-	[BNXT_ULP_CLASS_HID_dc48] = 3043,
-	[BNXT_ULP_CLASS_HID_e188] = 3044,
-	[BNXT_ULP_CLASS_HID_929c] = 3045,
-	[BNXT_ULP_CLASS_HID_b7dc] = 3046,
-	[BNXT_ULP_CLASS_HID_d91c] = 3047,
-	[BNXT_ULP_CLASS_HID_fa5c] = 3048,
-	[BNXT_ULP_CLASS_HID_1889c] = 3049,
-	[BNXT_ULP_CLASS_HID_1addc] = 3050,
-	[BNXT_ULP_CLASS_HID_1cf1c] = 3051,
-	[BNXT_ULP_CLASS_HID_1f05c] = 3052,
-	[BNXT_ULP_CLASS_HID_18fc8] = 3053,
-	[BNXT_ULP_CLASS_HID_1b108] = 3054,
-	[BNXT_ULP_CLASS_HID_1f248] = 3055,
-	[BNXT_ULP_CLASS_HID_1f788] = 3056,
-	[BNXT_ULP_CLASS_HID_ba7c] = 3057,
-	[BNXT_ULP_CLASS_HID_bfbc] = 3058,
-	[BNXT_ULP_CLASS_HID_e0fc] = 3059,
-	[BNXT_ULP_CLASS_HID_e23c] = 3060,
-	[BNXT_ULP_CLASS_HID_b700] = 3061,
-	[BNXT_ULP_CLASS_HID_b840] = 3062,
-	[BNXT_ULP_CLASS_HID_fd80] = 3063,
-	[BNXT_ULP_CLASS_HID_fec0] = 3064,
-	[BNXT_ULP_CLASS_HID_1ad00] = 3065,
-	[BNXT_ULP_CLASS_HID_1ae40] = 3066,
-	[BNXT_ULP_CLASS_HID_1d380] = 3067,
-	[BNXT_ULP_CLASS_HID_1f4c0] = 3068,
-	[BNXT_ULP_CLASS_HID_1d07c] = 3069,
-	[BNXT_ULP_CLASS_HID_1f5bc] = 3070,
-	[BNXT_ULP_CLASS_HID_1d6fc] = 3071,
-	[BNXT_ULP_CLASS_HID_1f83c] = 3072,
-	[BNXT_ULP_CLASS_HID_86a0] = 3073,
-	[BNXT_ULP_CLASS_HID_abe0] = 3074,
-	[BNXT_ULP_CLASS_HID_cd20] = 3075,
-	[BNXT_ULP_CLASS_HID_ee60] = 3076,
-	[BNXT_ULP_CLASS_HID_8374] = 3077,
-	[BNXT_ULP_CLASS_HID_a4b4] = 3078,
-	[BNXT_ULP_CLASS_HID_c9f4] = 3079,
-	[BNXT_ULP_CLASS_HID_eb34] = 3080,
-	[BNXT_ULP_CLASS_HID_1b974] = 3081,
-	[BNXT_ULP_CLASS_HID_1bab4] = 3082,
-	[BNXT_ULP_CLASS_HID_1fff4] = 3083,
-	[BNXT_ULP_CLASS_HID_1e134] = 3084,
-	[BNXT_ULP_CLASS_HID_1bca0] = 3085,
-	[BNXT_ULP_CLASS_HID_1a1e0] = 3086,
-	[BNXT_ULP_CLASS_HID_1e320] = 3087,
-	[BNXT_ULP_CLASS_HID_1e460] = 3088,
-	[BNXT_ULP_CLASS_HID_aad4] = 3089,
-	[BNXT_ULP_CLASS_HID_ac14] = 3090,
-	[BNXT_ULP_CLASS_HID_d154] = 3091,
-	[BNXT_ULP_CLASS_HID_f294] = 3092,
-	[BNXT_ULP_CLASS_HID_a798] = 3093,
-	[BNXT_ULP_CLASS_HID_a8d8] = 3094,
-	[BNXT_ULP_CLASS_HID_ea18] = 3095,
-	[BNXT_ULP_CLASS_HID_ef58] = 3096,
-	[BNXT_ULP_CLASS_HID_1dd98] = 3097,
-	[BNXT_ULP_CLASS_HID_1fed8] = 3098,
-	[BNXT_ULP_CLASS_HID_1c018] = 3099,
-	[BNXT_ULP_CLASS_HID_1e558] = 3100,
-	[BNXT_ULP_CLASS_HID_1c0d4] = 3101,
-	[BNXT_ULP_CLASS_HID_1e214] = 3102,
-	[BNXT_ULP_CLASS_HID_1c754] = 3103,
-	[BNXT_ULP_CLASS_HID_1e894] = 3104,
-	[BNXT_ULP_CLASS_HID_900c] = 3105,
-	[BNXT_ULP_CLASS_HID_b54c] = 3106,
-	[BNXT_ULP_CLASS_HID_d68c] = 3107,
-	[BNXT_ULP_CLASS_HID_fbcc] = 3108,
-	[BNXT_ULP_CLASS_HID_c80c] = 3109,
-	[BNXT_ULP_CLASS_HID_ed4c] = 3110,
-	[BNXT_ULP_CLASS_HID_d350] = 3111,
-	[BNXT_ULP_CLASS_HID_f490] = 3112,
-	[BNXT_ULP_CLASS_HID_182d0] = 3113,
-	[BNXT_ULP_CLASS_HID_1a410] = 3114,
-	[BNXT_ULP_CLASS_HID_1c950] = 3115,
-	[BNXT_ULP_CLASS_HID_1ea90] = 3116,
-	[BNXT_ULP_CLASS_HID_1860c] = 3117,
-	[BNXT_ULP_CLASS_HID_1ab4c] = 3118,
-	[BNXT_ULP_CLASS_HID_1cc8c] = 3119,
-	[BNXT_ULP_CLASS_HID_1f1cc] = 3120,
-	[BNXT_ULP_CLASS_HID_b4b0] = 3121,
-	[BNXT_ULP_CLASS_HID_b9f0] = 3122,
-	[BNXT_ULP_CLASS_HID_fb30] = 3123,
-	[BNXT_ULP_CLASS_HID_fc70] = 3124,
-	[BNXT_ULP_CLASS_HID_b144] = 3125,
-	[BNXT_ULP_CLASS_HID_b284] = 3126,
-	[BNXT_ULP_CLASS_HID_f7c4] = 3127,
-	[BNXT_ULP_CLASS_HID_f904] = 3128,
-	[BNXT_ULP_CLASS_HID_1a744] = 3129,
-	[BNXT_ULP_CLASS_HID_1a884] = 3130,
-	[BNXT_ULP_CLASS_HID_1edc4] = 3131,
-	[BNXT_ULP_CLASS_HID_1ef04] = 3132,
-	[BNXT_ULP_CLASS_HID_1aab0] = 3133,
-	[BNXT_ULP_CLASS_HID_1aff0] = 3134,
-	[BNXT_ULP_CLASS_HID_1d130] = 3135,
-	[BNXT_ULP_CLASS_HID_1f270] = 3136,
-	[BNXT_ULP_CLASS_HID_80e4] = 3137,
-	[BNXT_ULP_CLASS_HID_a224] = 3138,
-	[BNXT_ULP_CLASS_HID_c764] = 3139,
-	[BNXT_ULP_CLASS_HID_e8a4] = 3140,
-	[BNXT_ULP_CLASS_HID_9da8] = 3141,
-	[BNXT_ULP_CLASS_HID_bee8] = 3142,
-	[BNXT_ULP_CLASS_HID_c028] = 3143,
-	[BNXT_ULP_CLASS_HID_e568] = 3144,
-	[BNXT_ULP_CLASS_HID_1b3a8] = 3145,
-	[BNXT_ULP_CLASS_HID_1b4e8] = 3146,
-	[BNXT_ULP_CLASS_HID_1f628] = 3147,
-	[BNXT_ULP_CLASS_HID_1fb68] = 3148,
-	[BNXT_ULP_CLASS_HID_1b6e4] = 3149,
-	[BNXT_ULP_CLASS_HID_1b824] = 3150,
-	[BNXT_ULP_CLASS_HID_1fd64] = 3151,
-	[BNXT_ULP_CLASS_HID_1fea4] = 3152,
-	[BNXT_ULP_CLASS_HID_a508] = 3153,
-	[BNXT_ULP_CLASS_HID_a648] = 3154,
-	[BNXT_ULP_CLASS_HID_eb88] = 3155,
-	[BNXT_ULP_CLASS_HID_ecc8] = 3156,
-	[BNXT_ULP_CLASS_HID_a1dc] = 3157,
-	[BNXT_ULP_CLASS_HID_a31c] = 3158,
-	[BNXT_ULP_CLASS_HID_e45c] = 3159,
-	[BNXT_ULP_CLASS_HID_e99c] = 3160,
-	[BNXT_ULP_CLASS_HID_1d7dc] = 3161,
-	[BNXT_ULP_CLASS_HID_1f91c] = 3162,
-	[BNXT_ULP_CLASS_HID_1da5c] = 3163,
-	[BNXT_ULP_CLASS_HID_1ff9c] = 3164,
-	[BNXT_ULP_CLASS_HID_1db08] = 3165,
-	[BNXT_ULP_CLASS_HID_1fc48] = 3166,
-	[BNXT_ULP_CLASS_HID_1c188] = 3167,
-	[BNXT_ULP_CLASS_HID_1e2c8] = 3168,
-	[BNXT_ULP_CLASS_HID_9ad8] = 3169,
-	[BNXT_ULP_CLASS_HID_bc18] = 3170,
-	[BNXT_ULP_CLASS_HID_c158] = 3171,
-	[BNXT_ULP_CLASS_HID_e298] = 3172,
-	[BNXT_ULP_CLASS_HID_97ec] = 3173,
-	[BNXT_ULP_CLASS_HID_b92c] = 3174,
-	[BNXT_ULP_CLASS_HID_da6c] = 3175,
-	[BNXT_ULP_CLASS_HID_ffac] = 3176,
-	[BNXT_ULP_CLASS_HID_18dec] = 3177,
-	[BNXT_ULP_CLASS_HID_1af2c] = 3178,
-	[BNXT_ULP_CLASS_HID_1f06c] = 3179,
-	[BNXT_ULP_CLASS_HID_1f5ac] = 3180,
-	[BNXT_ULP_CLASS_HID_1b0d8] = 3181,
-	[BNXT_ULP_CLASS_HID_1b218] = 3182,
-	[BNXT_ULP_CLASS_HID_1f758] = 3183,
-	[BNXT_ULP_CLASS_HID_1f898] = 3184,
-	[BNXT_ULP_CLASS_HID_bf4c] = 3185,
-	[BNXT_ULP_CLASS_HID_a08c] = 3186,
-	[BNXT_ULP_CLASS_HID_e5cc] = 3187,
-	[BNXT_ULP_CLASS_HID_e70c] = 3188,
-	[BNXT_ULP_CLASS_HID_b810] = 3189,
-	[BNXT_ULP_CLASS_HID_bd50] = 3190,
-	[BNXT_ULP_CLASS_HID_fe90] = 3191,
-	[BNXT_ULP_CLASS_HID_e3d0] = 3192,
-	[BNXT_ULP_CLASS_HID_1ae10] = 3193,
-	[BNXT_ULP_CLASS_HID_1f350] = 3194,
-	[BNXT_ULP_CLASS_HID_1d490] = 3195,
-	[BNXT_ULP_CLASS_HID_1f9d0] = 3196,
-	[BNXT_ULP_CLASS_HID_1d54c] = 3197,
-	[BNXT_ULP_CLASS_HID_1f68c] = 3198,
-	[BNXT_ULP_CLASS_HID_1dbcc] = 3199,
-	[BNXT_ULP_CLASS_HID_1fd0c] = 3200,
-	[BNXT_ULP_CLASS_HID_34b0] = 3201,
-	[BNXT_ULP_CLASS_HID_3a7c] = 3202,
-	[BNXT_ULP_CLASS_HID_3700] = 3203,
-	[BNXT_ULP_CLASS_HID_5ee0] = 3204,
-	[BNXT_ULP_CLASS_HID_5bb4] = 3205,
-	[BNXT_ULP_CLASS_HID_07d8] = 3206,
-	[BNXT_ULP_CLASS_HID_00ec] = 3207,
-	[BNXT_ULP_CLASS_HID_284c] = 3208,
-	[BNXT_ULP_CLASS_HID_2510] = 3209,
-	[BNXT_ULP_CLASS_HID_3144] = 3210,
-	[BNXT_ULP_CLASS_HID_5924] = 3211,
-	[BNXT_ULP_CLASS_HID_55e8] = 3212,
-	[BNXT_ULP_CLASS_HID_1e1c] = 3213,
-	[BNXT_ULP_CLASS_HID_1b20] = 3214,
-	[BNXT_ULP_CLASS_HID_2280] = 3215,
-	[BNXT_ULP_CLASS_HID_3f54] = 3216,
-	[BNXT_ULP_CLASS_HID_24604] = 3217,
-	[BNXT_ULP_CLASS_HID_255d4] = 3218,
-	[BNXT_ULP_CLASS_HID_22e08] = 3219,
-	[BNXT_ULP_CLASS_HID_24378] = 3220,
-	[BNXT_ULP_CLASS_HID_20fcc] = 3221,
-	[BNXT_ULP_CLASS_HID_21a9c] = 3222,
-	[BNXT_ULP_CLASS_HID_217d0] = 3223,
-	[BNXT_ULP_CLASS_HID_20800] = 3224,
-	[BNXT_ULP_CLASS_HID_253a0] = 3225,
-	[BNXT_ULP_CLASS_HID_23f70] = 3226,
-	[BNXT_ULP_CLASS_HID_23ba4] = 3227,
-	[BNXT_ULP_CLASS_HID_22c94] = 3228,
-	[BNXT_ULP_CLASS_HID_21968] = 3229,
-	[BNXT_ULP_CLASS_HID_243c4] = 3230,
-	[BNXT_ULP_CLASS_HID_25c38] = 3231,
-	[BNXT_ULP_CLASS_HID_2125c] = 3232,
-	[BNXT_ULP_CLASS_HID_240c8] = 3233,
-	[BNXT_ULP_CLASS_HID_22f98] = 3234,
-	[BNXT_ULP_CLASS_HID_228cc] = 3235,
-	[BNXT_ULP_CLASS_HID_25d3c] = 3236,
-	[BNXT_ULP_CLASS_HID_20990] = 3237,
-	[BNXT_ULP_CLASS_HID_214a0] = 3238,
-	[BNXT_ULP_CLASS_HID_21194] = 3239,
-	[BNXT_ULP_CLASS_HID_202c4] = 3240,
-	[BNXT_ULP_CLASS_HID_22a64] = 3241,
-	[BNXT_ULP_CLASS_HID_23934] = 3242,
-	[BNXT_ULP_CLASS_HID_23268] = 3243,
-	[BNXT_ULP_CLASS_HID_22758] = 3244,
-	[BNXT_ULP_CLASS_HID_2132c] = 3245,
-	[BNXT_ULP_CLASS_HID_25d88] = 3246,
-	[BNXT_ULP_CLASS_HID_256fc] = 3247,
-	[BNXT_ULP_CLASS_HID_24b2c] = 3248,
-	[BNXT_ULP_CLASS_HID_22f14] = 3249,
-	[BNXT_ULP_CLASS_HID_23a24] = 3250,
-	[BNXT_ULP_CLASS_HID_23718] = 3251,
-	[BNXT_ULP_CLASS_HID_22848] = 3252,
-	[BNXT_ULP_CLASS_HID_214dc] = 3253,
-	[BNXT_ULP_CLASS_HID_25eb8] = 3254,
-	[BNXT_ULP_CLASS_HID_25bec] = 3255,
-	[BNXT_ULP_CLASS_HID_21110] = 3256,
-	[BNXT_ULP_CLASS_HID_238b0] = 3257,
-	[BNXT_ULP_CLASS_HID_20440] = 3258,
-	[BNXT_ULP_CLASS_HID_200b4] = 3259,
-	[BNXT_ULP_CLASS_HID_235e4] = 3260,
-	[BNXT_ULP_CLASS_HID_25d04] = 3261,
-	[BNXT_ULP_CLASS_HID_228d4] = 3262,
-	[BNXT_ULP_CLASS_HID_22508] = 3263,
-	[BNXT_ULP_CLASS_HID_25678] = 3264,
-	[BNXT_ULP_CLASS_HID_229d8] = 3265,
-	[BNXT_ULP_CLASS_HID_234e8] = 3266,
-	[BNXT_ULP_CLASS_HID_231dc] = 3267,
-	[BNXT_ULP_CLASS_HID_2220c] = 3268,
-	[BNXT_ULP_CLASS_HID_24dac] = 3269,
-	[BNXT_ULP_CLASS_HID_2597c] = 3270,
-	[BNXT_ULP_CLASS_HID_255b0] = 3271,
-	[BNXT_ULP_CLASS_HID_246e0] = 3272,
-	[BNXT_ULP_CLASS_HID_23374] = 3273,
-	[BNXT_ULP_CLASS_HID_21e04] = 3274,
-	[BNXT_ULP_CLASS_HID_21b78] = 3275,
-	[BNXT_ULP_CLASS_HID_20fa8] = 3276,
-	[BNXT_ULP_CLASS_HID_257c8] = 3277,
-	[BNXT_ULP_CLASS_HID_22298] = 3278,
-	[BNXT_ULP_CLASS_HID_23fcc] = 3279,
-	[BNXT_ULP_CLASS_HID_2503c] = 3280,
-	[BNXT_ULP_CLASS_HID_2239c] = 3281,
-	[BNXT_ULP_CLASS_HID_20eac] = 3282,
-	[BNXT_ULP_CLASS_HID_20be0] = 3283,
-	[BNXT_ULP_CLASS_HID_23cd0] = 3284,
-	[BNXT_ULP_CLASS_HID_24470] = 3285,
-	[BNXT_ULP_CLASS_HID_25300] = 3286,
-	[BNXT_ULP_CLASS_HID_22c74] = 3287,
-	[BNXT_ULP_CLASS_HID_240a4] = 3288,
-	[BNXT_ULP_CLASS_HID_23da0] = 3289,
-	[BNXT_ULP_CLASS_HID_20970] = 3290,
-	[BNXT_ULP_CLASS_HID_205a4] = 3291,
-	[BNXT_ULP_CLASS_HID_23694] = 3292,
-	[BNXT_ULP_CLASS_HID_25e34] = 3293,
-	[BNXT_ULP_CLASS_HID_22dc4] = 3294,
-	[BNXT_ULP_CLASS_HID_22638] = 3295,
-	[BNXT_ULP_CLASS_HID_25b68] = 3296,
-	[BNXT_ULP_CLASS_HID_34c8] = 3297,
-	[BNXT_ULP_CLASS_HID_3a04] = 3298,
-	[BNXT_ULP_CLASS_HID_09d4] = 3299,
-	[BNXT_ULP_CLASS_HID_5e98] = 3300,
-	[BNXT_ULP_CLASS_HID_2da8] = 3301,
-	[BNXT_ULP_CLASS_HID_07a0] = 3302,
-	[BNXT_ULP_CLASS_HID_1370] = 3303,
-	[BNXT_ULP_CLASS_HID_2834] = 3304,
-	[BNXT_ULP_CLASS_HID_37c4] = 3305,
-	[BNXT_ULP_CLASS_HID_0398] = 3306,
-	[BNXT_ULP_CLASS_HID_595c] = 3307,
-	[BNXT_ULP_CLASS_HID_246c] = 3308,
-	[BNXT_ULP_CLASS_HID_1e64] = 3309,
-	[BNXT_ULP_CLASS_HID_48c0] = 3310,
-	[BNXT_ULP_CLASS_HID_22f8] = 3311,
-	[BNXT_ULP_CLASS_HID_3188] = 3312,
-	[BNXT_ULP_CLASS_HID_24664] = 3313,
-	[BNXT_ULP_CLASS_HID_29418] = 3314,
-	[BNXT_ULP_CLASS_HID_30118] = 3315,
-	[BNXT_ULP_CLASS_HID_38a18] = 3316,
-	[BNXT_ULP_CLASS_HID_255b4] = 3317,
-	[BNXT_ULP_CLASS_HID_2deb4] = 3318,
-	[BNXT_ULP_CLASS_HID_34bb4] = 3319,
-	[BNXT_ULP_CLASS_HID_39968] = 3320,
-	[BNXT_ULP_CLASS_HID_22e68] = 3321,
-	[BNXT_ULP_CLASS_HID_2db68] = 3322,
-	[BNXT_ULP_CLASS_HID_34468] = 3323,
-	[BNXT_ULP_CLASS_HID_3921c] = 3324,
-	[BNXT_ULP_CLASS_HID_24318] = 3325,
-	[BNXT_ULP_CLASS_HID_290cc] = 3326,
-	[BNXT_ULP_CLASS_HID_31dcc] = 3327,
-	[BNXT_ULP_CLASS_HID_386cc] = 3328,
-	[BNXT_ULP_CLASS_HID_20fac] = 3329,
-	[BNXT_ULP_CLASS_HID_2b8ac] = 3330,
-	[BNXT_ULP_CLASS_HID_325ac] = 3331,
-	[BNXT_ULP_CLASS_HID_3aeac] = 3332,
-	[BNXT_ULP_CLASS_HID_21afc] = 3333,
-	[BNXT_ULP_CLASS_HID_287fc] = 3334,
-	[BNXT_ULP_CLASS_HID_330fc] = 3335,
-	[BNXT_ULP_CLASS_HID_3bdfc] = 3336,
-	[BNXT_ULP_CLASS_HID_217b0] = 3337,
-	[BNXT_ULP_CLASS_HID_280b0] = 3338,
-	[BNXT_ULP_CLASS_HID_30db0] = 3339,
-	[BNXT_ULP_CLASS_HID_3b6b0] = 3340,
-	[BNXT_ULP_CLASS_HID_20860] = 3341,
-	[BNXT_ULP_CLASS_HID_2b560] = 3342,
-	[BNXT_ULP_CLASS_HID_33e60] = 3343,
-	[BNXT_ULP_CLASS_HID_3ab60] = 3344,
-	[BNXT_ULP_CLASS_HID_253c0] = 3345,
-	[BNXT_ULP_CLASS_HID_2dcc0] = 3346,
-	[BNXT_ULP_CLASS_HID_349c0] = 3347,
-	[BNXT_ULP_CLASS_HID_397f4] = 3348,
-	[BNXT_ULP_CLASS_HID_23f10] = 3349,
-	[BNXT_ULP_CLASS_HID_2a810] = 3350,
-	[BNXT_ULP_CLASS_HID_35510] = 3351,
-	[BNXT_ULP_CLASS_HID_3de10] = 3352,
-	[BNXT_ULP_CLASS_HID_23bc4] = 3353,
-	[BNXT_ULP_CLASS_HID_2a4c4] = 3354,
-	[BNXT_ULP_CLASS_HID_351c4] = 3355,
-	[BNXT_ULP_CLASS_HID_3dac4] = 3356,
-	[BNXT_ULP_CLASS_HID_22cf4] = 3357,
-	[BNXT_ULP_CLASS_HID_2d9f4] = 3358,
-	[BNXT_ULP_CLASS_HID_342f4] = 3359,
-	[BNXT_ULP_CLASS_HID_390a8] = 3360,
-	[BNXT_ULP_CLASS_HID_21908] = 3361,
-	[BNXT_ULP_CLASS_HID_28208] = 3362,
-	[BNXT_ULP_CLASS_HID_30f08] = 3363,
-	[BNXT_ULP_CLASS_HID_3b808] = 3364,
-	[BNXT_ULP_CLASS_HID_243a4] = 3365,
-	[BNXT_ULP_CLASS_HID_29158] = 3366,
-	[BNXT_ULP_CLASS_HID_31a58] = 3367,
-	[BNXT_ULP_CLASS_HID_38758] = 3368,
-	[BNXT_ULP_CLASS_HID_25c58] = 3369,
-	[BNXT_ULP_CLASS_HID_2c958] = 3370,
-	[BNXT_ULP_CLASS_HID_3170c] = 3371,
-	[BNXT_ULP_CLASS_HID_3800c] = 3372,
-	[BNXT_ULP_CLASS_HID_2123c] = 3373,
-	[BNXT_ULP_CLASS_HID_29f3c] = 3374,
-	[BNXT_ULP_CLASS_HID_3083c] = 3375,
-	[BNXT_ULP_CLASS_HID_3b53c] = 3376,
-	[BNXT_ULP_CLASS_HID_240a8] = 3377,
-	[BNXT_ULP_CLASS_HID_2cda8] = 3378,
-	[BNXT_ULP_CLASS_HID_31b5c] = 3379,
-	[BNXT_ULP_CLASS_HID_3845c] = 3380,
-	[BNXT_ULP_CLASS_HID_22ff8] = 3381,
-	[BNXT_ULP_CLASS_HID_2d8f8] = 3382,
-	[BNXT_ULP_CLASS_HID_345f8] = 3383,
-	[BNXT_ULP_CLASS_HID_393ac] = 3384,
-	[BNXT_ULP_CLASS_HID_228ac] = 3385,
-	[BNXT_ULP_CLASS_HID_2d5ac] = 3386,
-	[BNXT_ULP_CLASS_HID_35eac] = 3387,
-	[BNXT_ULP_CLASS_HID_3cbac] = 3388,
-	[BNXT_ULP_CLASS_HID_25d5c] = 3389,
-	[BNXT_ULP_CLASS_HID_2c65c] = 3390,
-	[BNXT_ULP_CLASS_HID_31410] = 3391,
-	[BNXT_ULP_CLASS_HID_38110] = 3392,
-	[BNXT_ULP_CLASS_HID_209f0] = 3393,
-	[BNXT_ULP_CLASS_HID_2b2f0] = 3394,
-	[BNXT_ULP_CLASS_HID_33ff0] = 3395,
-	[BNXT_ULP_CLASS_HID_3a8f0] = 3396,
-	[BNXT_ULP_CLASS_HID_214c0] = 3397,
-	[BNXT_ULP_CLASS_HID_281c0] = 3398,
-	[BNXT_ULP_CLASS_HID_30ac0] = 3399,
-	[BNXT_ULP_CLASS_HID_3b7c0] = 3400,
-	[BNXT_ULP_CLASS_HID_211f4] = 3401,
-	[BNXT_ULP_CLASS_HID_29af4] = 3402,
-	[BNXT_ULP_CLASS_HID_307f4] = 3403,
-	[BNXT_ULP_CLASS_HID_3b0f4] = 3404,
-	[BNXT_ULP_CLASS_HID_202a4] = 3405,
-	[BNXT_ULP_CLASS_HID_28fa4] = 3406,
-	[BNXT_ULP_CLASS_HID_338a4] = 3407,
-	[BNXT_ULP_CLASS_HID_3a5a4] = 3408,
-	[BNXT_ULP_CLASS_HID_22a04] = 3409,
-	[BNXT_ULP_CLASS_HID_2d704] = 3410,
-	[BNXT_ULP_CLASS_HID_34004] = 3411,
-	[BNXT_ULP_CLASS_HID_3cd04] = 3412,
-	[BNXT_ULP_CLASS_HID_23954] = 3413,
-	[BNXT_ULP_CLASS_HID_2a254] = 3414,
-	[BNXT_ULP_CLASS_HID_32f54] = 3415,
-	[BNXT_ULP_CLASS_HID_3d854] = 3416,
-	[BNXT_ULP_CLASS_HID_23208] = 3417,
-	[BNXT_ULP_CLASS_HID_2bf08] = 3418,
-	[BNXT_ULP_CLASS_HID_32808] = 3419,
-	[BNXT_ULP_CLASS_HID_3d508] = 3420,
-	[BNXT_ULP_CLASS_HID_22738] = 3421,
-	[BNXT_ULP_CLASS_HID_2d038] = 3422,
-	[BNXT_ULP_CLASS_HID_35d38] = 3423,
-	[BNXT_ULP_CLASS_HID_3c638] = 3424,
-	[BNXT_ULP_CLASS_HID_2134c] = 3425,
-	[BNXT_ULP_CLASS_HID_29c4c] = 3426,
-	[BNXT_ULP_CLASS_HID_3094c] = 3427,
-	[BNXT_ULP_CLASS_HID_3b24c] = 3428,
-	[BNXT_ULP_CLASS_HID_25de8] = 3429,
-	[BNXT_ULP_CLASS_HID_2c6e8] = 3430,
-	[BNXT_ULP_CLASS_HID_3149c] = 3431,
-	[BNXT_ULP_CLASS_HID_3819c] = 3432,
-	[BNXT_ULP_CLASS_HID_2569c] = 3433,
-	[BNXT_ULP_CLASS_HID_2c39c] = 3434,
-	[BNXT_ULP_CLASS_HID_31150] = 3435,
-	[BNXT_ULP_CLASS_HID_39a50] = 3436,
-	[BNXT_ULP_CLASS_HID_24b4c] = 3437,
-	[BNXT_ULP_CLASS_HID_29900] = 3438,
-	[BNXT_ULP_CLASS_HID_30200] = 3439,
-	[BNXT_ULP_CLASS_HID_38f00] = 3440,
-	[BNXT_ULP_CLASS_HID_22f74] = 3441,
-	[BNXT_ULP_CLASS_HID_2d874] = 3442,
-	[BNXT_ULP_CLASS_HID_34574] = 3443,
-	[BNXT_ULP_CLASS_HID_39328] = 3444,
-	[BNXT_ULP_CLASS_HID_23a44] = 3445,
-	[BNXT_ULP_CLASS_HID_2a744] = 3446,
-	[BNXT_ULP_CLASS_HID_35044] = 3447,
-	[BNXT_ULP_CLASS_HID_3dd44] = 3448,
-	[BNXT_ULP_CLASS_HID_23778] = 3449,
-	[BNXT_ULP_CLASS_HID_2a078] = 3450,
-	[BNXT_ULP_CLASS_HID_32d78] = 3451,
-	[BNXT_ULP_CLASS_HID_3d678] = 3452,
-	[BNXT_ULP_CLASS_HID_22828] = 3453,
-	[BNXT_ULP_CLASS_HID_2d528] = 3454,
-	[BNXT_ULP_CLASS_HID_35e28] = 3455,
-	[BNXT_ULP_CLASS_HID_3cb28] = 3456,
-	[BNXT_ULP_CLASS_HID_214bc] = 3457,
-	[BNXT_ULP_CLASS_HID_281bc] = 3458,
-	[BNXT_ULP_CLASS_HID_30abc] = 3459,
-	[BNXT_ULP_CLASS_HID_3b7bc] = 3460,
-	[BNXT_ULP_CLASS_HID_25ed8] = 3461,
-	[BNXT_ULP_CLASS_HID_2cbd8] = 3462,
-	[BNXT_ULP_CLASS_HID_3198c] = 3463,
-	[BNXT_ULP_CLASS_HID_3828c] = 3464,
-	[BNXT_ULP_CLASS_HID_25b8c] = 3465,
-	[BNXT_ULP_CLASS_HID_2c48c] = 3466,
-	[BNXT_ULP_CLASS_HID_31240] = 3467,
-	[BNXT_ULP_CLASS_HID_39f40] = 3468,
-	[BNXT_ULP_CLASS_HID_21170] = 3469,
-	[BNXT_ULP_CLASS_HID_29a70] = 3470,
-	[BNXT_ULP_CLASS_HID_30770] = 3471,
-	[BNXT_ULP_CLASS_HID_3b070] = 3472,
-	[BNXT_ULP_CLASS_HID_238d0] = 3473,
-	[BNXT_ULP_CLASS_HID_2a5d0] = 3474,
-	[BNXT_ULP_CLASS_HID_32ed0] = 3475,
-	[BNXT_ULP_CLASS_HID_3dbd0] = 3476,
-	[BNXT_ULP_CLASS_HID_20420] = 3477,
-	[BNXT_ULP_CLASS_HID_2b120] = 3478,
-	[BNXT_ULP_CLASS_HID_33a20] = 3479,
-	[BNXT_ULP_CLASS_HID_3a720] = 3480,
-	[BNXT_ULP_CLASS_HID_200d4] = 3481,
-	[BNXT_ULP_CLASS_HID_28dd4] = 3482,
-	[BNXT_ULP_CLASS_HID_336d4] = 3483,
-	[BNXT_ULP_CLASS_HID_3a3d4] = 3484,
-	[BNXT_ULP_CLASS_HID_23584] = 3485,
-	[BNXT_ULP_CLASS_HID_2be84] = 3486,
-	[BNXT_ULP_CLASS_HID_32b84] = 3487,
-	[BNXT_ULP_CLASS_HID_3d484] = 3488,
-	[BNXT_ULP_CLASS_HID_25d64] = 3489,
-	[BNXT_ULP_CLASS_HID_2c664] = 3490,
-	[BNXT_ULP_CLASS_HID_31418] = 3491,
-	[BNXT_ULP_CLASS_HID_38118] = 3492,
-	[BNXT_ULP_CLASS_HID_228b4] = 3493,
-	[BNXT_ULP_CLASS_HID_2d5b4] = 3494,
-	[BNXT_ULP_CLASS_HID_35eb4] = 3495,
-	[BNXT_ULP_CLASS_HID_3cbb4] = 3496,
-	[BNXT_ULP_CLASS_HID_22568] = 3497,
-	[BNXT_ULP_CLASS_HID_2ae68] = 3498,
-	[BNXT_ULP_CLASS_HID_35b68] = 3499,
-	[BNXT_ULP_CLASS_HID_3c468] = 3500,
-	[BNXT_ULP_CLASS_HID_25618] = 3501,
-	[BNXT_ULP_CLASS_HID_2c318] = 3502,
-	[BNXT_ULP_CLASS_HID_310cc] = 3503,
-	[BNXT_ULP_CLASS_HID_39dcc] = 3504,
-	[BNXT_ULP_CLASS_HID_229b8] = 3505,
-	[BNXT_ULP_CLASS_HID_2d2b8] = 3506,
-	[BNXT_ULP_CLASS_HID_35fb8] = 3507,
-	[BNXT_ULP_CLASS_HID_3c8b8] = 3508,
-	[BNXT_ULP_CLASS_HID_23488] = 3509,
-	[BNXT_ULP_CLASS_HID_2a188] = 3510,
-	[BNXT_ULP_CLASS_HID_32a88] = 3511,
-	[BNXT_ULP_CLASS_HID_3d788] = 3512,
-	[BNXT_ULP_CLASS_HID_231bc] = 3513,
-	[BNXT_ULP_CLASS_HID_2babc] = 3514,
-	[BNXT_ULP_CLASS_HID_327bc] = 3515,
-	[BNXT_ULP_CLASS_HID_3d0bc] = 3516,
-	[BNXT_ULP_CLASS_HID_2226c] = 3517,
-	[BNXT_ULP_CLASS_HID_2af6c] = 3518,
-	[BNXT_ULP_CLASS_HID_3586c] = 3519,
-	[BNXT_ULP_CLASS_HID_3c56c] = 3520,
-	[BNXT_ULP_CLASS_HID_24dcc] = 3521,
-	[BNXT_ULP_CLASS_HID_29b80] = 3522,
-	[BNXT_ULP_CLASS_HID_30480] = 3523,
-	[BNXT_ULP_CLASS_HID_3b180] = 3524,
-	[BNXT_ULP_CLASS_HID_2591c] = 3525,
-	[BNXT_ULP_CLASS_HID_2c21c] = 3526,
-	[BNXT_ULP_CLASS_HID_313d0] = 3527,
-	[BNXT_ULP_CLASS_HID_39cd0] = 3528,
-	[BNXT_ULP_CLASS_HID_255d0] = 3529,
-	[BNXT_ULP_CLASS_HID_2ded0] = 3530,
-	[BNXT_ULP_CLASS_HID_34bd0] = 3531,
-	[BNXT_ULP_CLASS_HID_39984] = 3532,
-	[BNXT_ULP_CLASS_HID_24680] = 3533,
-	[BNXT_ULP_CLASS_HID_294b4] = 3534,
-	[BNXT_ULP_CLASS_HID_301b4] = 3535,
-	[BNXT_ULP_CLASS_HID_38ab4] = 3536,
-	[BNXT_ULP_CLASS_HID_23314] = 3537,
-	[BNXT_ULP_CLASS_HID_2bc14] = 3538,
-	[BNXT_ULP_CLASS_HID_32914] = 3539,
-	[BNXT_ULP_CLASS_HID_3d214] = 3540,
-	[BNXT_ULP_CLASS_HID_21e64] = 3541,
-	[BNXT_ULP_CLASS_HID_28b64] = 3542,
-	[BNXT_ULP_CLASS_HID_33464] = 3543,
-	[BNXT_ULP_CLASS_HID_3a164] = 3544,
-	[BNXT_ULP_CLASS_HID_21b18] = 3545,
-	[BNXT_ULP_CLASS_HID_28418] = 3546,
-	[BNXT_ULP_CLASS_HID_33118] = 3547,
-	[BNXT_ULP_CLASS_HID_3ba18] = 3548,
-	[BNXT_ULP_CLASS_HID_20fc8] = 3549,
-	[BNXT_ULP_CLASS_HID_2b8c8] = 3550,
-	[BNXT_ULP_CLASS_HID_325c8] = 3551,
-	[BNXT_ULP_CLASS_HID_3aec8] = 3552,
-	[BNXT_ULP_CLASS_HID_257a8] = 3553,
-	[BNXT_ULP_CLASS_HID_2c0a8] = 3554,
-	[BNXT_ULP_CLASS_HID_34da8] = 3555,
-	[BNXT_ULP_CLASS_HID_39b5c] = 3556,
-	[BNXT_ULP_CLASS_HID_222f8] = 3557,
-	[BNXT_ULP_CLASS_HID_2aff8] = 3558,
-	[BNXT_ULP_CLASS_HID_358f8] = 3559,
-	[BNXT_ULP_CLASS_HID_3c5f8] = 3560,
-	[BNXT_ULP_CLASS_HID_23fac] = 3561,
-	[BNXT_ULP_CLASS_HID_2a8ac] = 3562,
-	[BNXT_ULP_CLASS_HID_355ac] = 3563,
-	[BNXT_ULP_CLASS_HID_3deac] = 3564,
-	[BNXT_ULP_CLASS_HID_2505c] = 3565,
-	[BNXT_ULP_CLASS_HID_2dd5c] = 3566,
-	[BNXT_ULP_CLASS_HID_3465c] = 3567,
-	[BNXT_ULP_CLASS_HID_39410] = 3568,
-	[BNXT_ULP_CLASS_HID_223fc] = 3569,
-	[BNXT_ULP_CLASS_HID_2acfc] = 3570,
-	[BNXT_ULP_CLASS_HID_359fc] = 3571,
-	[BNXT_ULP_CLASS_HID_3c2fc] = 3572,
-	[BNXT_ULP_CLASS_HID_20ecc] = 3573,
-	[BNXT_ULP_CLASS_HID_2bbcc] = 3574,
-	[BNXT_ULP_CLASS_HID_324cc] = 3575,
-	[BNXT_ULP_CLASS_HID_3d1cc] = 3576,
-	[BNXT_ULP_CLASS_HID_20b80] = 3577,
-	[BNXT_ULP_CLASS_HID_2b480] = 3578,
-	[BNXT_ULP_CLASS_HID_32180] = 3579,
-	[BNXT_ULP_CLASS_HID_3aa80] = 3580,
-	[BNXT_ULP_CLASS_HID_23cb0] = 3581,
-	[BNXT_ULP_CLASS_HID_2a9b0] = 3582,
-	[BNXT_ULP_CLASS_HID_352b0] = 3583,
-	[BNXT_ULP_CLASS_HID_3dfb0] = 3584,
-	[BNXT_ULP_CLASS_HID_24410] = 3585,
-	[BNXT_ULP_CLASS_HID_295c4] = 3586,
-	[BNXT_ULP_CLASS_HID_31ec4] = 3587,
-	[BNXT_ULP_CLASS_HID_38bc4] = 3588,
-	[BNXT_ULP_CLASS_HID_25360] = 3589,
-	[BNXT_ULP_CLASS_HID_2dc60] = 3590,
-	[BNXT_ULP_CLASS_HID_34960] = 3591,
-	[BNXT_ULP_CLASS_HID_39714] = 3592,
-	[BNXT_ULP_CLASS_HID_22c14] = 3593,
-	[BNXT_ULP_CLASS_HID_2d914] = 3594,
-	[BNXT_ULP_CLASS_HID_34214] = 3595,
-	[BNXT_ULP_CLASS_HID_393c8] = 3596,
-	[BNXT_ULP_CLASS_HID_240c4] = 3597,
-	[BNXT_ULP_CLASS_HID_2cdc4] = 3598,
-	[BNXT_ULP_CLASS_HID_31bf8] = 3599,
-	[BNXT_ULP_CLASS_HID_384f8] = 3600,
-	[BNXT_ULP_CLASS_HID_23dc0] = 3601,
-	[BNXT_ULP_CLASS_HID_2a6c0] = 3602,
-	[BNXT_ULP_CLASS_HID_353c0] = 3603,
-	[BNXT_ULP_CLASS_HID_3dcc0] = 3604,
-	[BNXT_ULP_CLASS_HID_20910] = 3605,
-	[BNXT_ULP_CLASS_HID_2b210] = 3606,
-	[BNXT_ULP_CLASS_HID_33f10] = 3607,
-	[BNXT_ULP_CLASS_HID_3a810] = 3608,
-	[BNXT_ULP_CLASS_HID_205c4] = 3609,
-	[BNXT_ULP_CLASS_HID_28ec4] = 3610,
-	[BNXT_ULP_CLASS_HID_33bc4] = 3611,
-	[BNXT_ULP_CLASS_HID_3a4c4] = 3612,
-	[BNXT_ULP_CLASS_HID_236f4] = 3613,
-	[BNXT_ULP_CLASS_HID_2a3f4] = 3614,
-	[BNXT_ULP_CLASS_HID_32cf4] = 3615,
-	[BNXT_ULP_CLASS_HID_3d9f4] = 3616,
-	[BNXT_ULP_CLASS_HID_25e54] = 3617,
-	[BNXT_ULP_CLASS_HID_2cb54] = 3618,
-	[BNXT_ULP_CLASS_HID_31908] = 3619,
-	[BNXT_ULP_CLASS_HID_38208] = 3620,
-	[BNXT_ULP_CLASS_HID_22da4] = 3621,
-	[BNXT_ULP_CLASS_HID_2d6a4] = 3622,
-	[BNXT_ULP_CLASS_HID_343a4] = 3623,
-	[BNXT_ULP_CLASS_HID_39158] = 3624,
-	[BNXT_ULP_CLASS_HID_22658] = 3625,
-	[BNXT_ULP_CLASS_HID_2d358] = 3626,
-	[BNXT_ULP_CLASS_HID_35c58] = 3627,
-	[BNXT_ULP_CLASS_HID_3c958] = 3628,
-	[BNXT_ULP_CLASS_HID_25b08] = 3629,
-	[BNXT_ULP_CLASS_HID_2c408] = 3630,
-	[BNXT_ULP_CLASS_HID_3123c] = 3631,
-	[BNXT_ULP_CLASS_HID_39f3c] = 3632,
-	[BNXT_ULP_CLASS_HID_34a8] = 3633,
-	[BNXT_ULP_CLASS_HID_3a64] = 3634,
-	[BNXT_ULP_CLASS_HID_09b4] = 3635,
-	[BNXT_ULP_CLASS_HID_5ef8] = 3636,
-	[BNXT_ULP_CLASS_HID_2dc8] = 3637,
-	[BNXT_ULP_CLASS_HID_07c0] = 3638,
-	[BNXT_ULP_CLASS_HID_1310] = 3639,
-	[BNXT_ULP_CLASS_HID_2854] = 3640,
-	[BNXT_ULP_CLASS_HID_37a4] = 3641,
-	[BNXT_ULP_CLASS_HID_03f8] = 3642,
-	[BNXT_ULP_CLASS_HID_593c] = 3643,
-	[BNXT_ULP_CLASS_HID_240c] = 3644,
-	[BNXT_ULP_CLASS_HID_1e04] = 3645,
-	[BNXT_ULP_CLASS_HID_48a0] = 3646,
-	[BNXT_ULP_CLASS_HID_2298] = 3647,
-	[BNXT_ULP_CLASS_HID_31e8] = 3648,
-	[BNXT_ULP_CLASS_HID_24644] = 3649,
-	[BNXT_ULP_CLASS_HID_29438] = 3650,
-	[BNXT_ULP_CLASS_HID_30138] = 3651,
-	[BNXT_ULP_CLASS_HID_38a38] = 3652,
-	[BNXT_ULP_CLASS_HID_25594] = 3653,
-	[BNXT_ULP_CLASS_HID_2de94] = 3654,
-	[BNXT_ULP_CLASS_HID_34b94] = 3655,
-	[BNXT_ULP_CLASS_HID_39948] = 3656,
-	[BNXT_ULP_CLASS_HID_22e48] = 3657,
-	[BNXT_ULP_CLASS_HID_2db48] = 3658,
-	[BNXT_ULP_CLASS_HID_34448] = 3659,
-	[BNXT_ULP_CLASS_HID_3923c] = 3660,
-	[BNXT_ULP_CLASS_HID_24338] = 3661,
-	[BNXT_ULP_CLASS_HID_290ec] = 3662,
-	[BNXT_ULP_CLASS_HID_31dec] = 3663,
-	[BNXT_ULP_CLASS_HID_386ec] = 3664,
-	[BNXT_ULP_CLASS_HID_20f8c] = 3665,
-	[BNXT_ULP_CLASS_HID_2b88c] = 3666,
-	[BNXT_ULP_CLASS_HID_3258c] = 3667,
-	[BNXT_ULP_CLASS_HID_3ae8c] = 3668,
-	[BNXT_ULP_CLASS_HID_21adc] = 3669,
-	[BNXT_ULP_CLASS_HID_287dc] = 3670,
-	[BNXT_ULP_CLASS_HID_330dc] = 3671,
-	[BNXT_ULP_CLASS_HID_3bddc] = 3672,
-	[BNXT_ULP_CLASS_HID_21790] = 3673,
-	[BNXT_ULP_CLASS_HID_28090] = 3674,
-	[BNXT_ULP_CLASS_HID_30d90] = 3675,
-	[BNXT_ULP_CLASS_HID_3b690] = 3676,
-	[BNXT_ULP_CLASS_HID_20840] = 3677,
-	[BNXT_ULP_CLASS_HID_2b540] = 3678,
-	[BNXT_ULP_CLASS_HID_33e40] = 3679,
-	[BNXT_ULP_CLASS_HID_3ab40] = 3680,
-	[BNXT_ULP_CLASS_HID_253e0] = 3681,
-	[BNXT_ULP_CLASS_HID_2dce0] = 3682,
-	[BNXT_ULP_CLASS_HID_349e0] = 3683,
-	[BNXT_ULP_CLASS_HID_397d4] = 3684,
-	[BNXT_ULP_CLASS_HID_23f30] = 3685,
-	[BNXT_ULP_CLASS_HID_2a830] = 3686,
-	[BNXT_ULP_CLASS_HID_35530] = 3687,
-	[BNXT_ULP_CLASS_HID_3de30] = 3688,
-	[BNXT_ULP_CLASS_HID_23be4] = 3689,
-	[BNXT_ULP_CLASS_HID_2a4e4] = 3690,
-	[BNXT_ULP_CLASS_HID_351e4] = 3691,
-	[BNXT_ULP_CLASS_HID_3dae4] = 3692,
-	[BNXT_ULP_CLASS_HID_22cd4] = 3693,
-	[BNXT_ULP_CLASS_HID_2d9d4] = 3694,
-	[BNXT_ULP_CLASS_HID_342d4] = 3695,
-	[BNXT_ULP_CLASS_HID_39088] = 3696,
-	[BNXT_ULP_CLASS_HID_21928] = 3697,
-	[BNXT_ULP_CLASS_HID_28228] = 3698,
-	[BNXT_ULP_CLASS_HID_30f28] = 3699,
-	[BNXT_ULP_CLASS_HID_3b828] = 3700,
-	[BNXT_ULP_CLASS_HID_24384] = 3701,
-	[BNXT_ULP_CLASS_HID_29178] = 3702,
-	[BNXT_ULP_CLASS_HID_31a78] = 3703,
-	[BNXT_ULP_CLASS_HID_38778] = 3704,
-	[BNXT_ULP_CLASS_HID_25c78] = 3705,
-	[BNXT_ULP_CLASS_HID_2c978] = 3706,
-	[BNXT_ULP_CLASS_HID_3172c] = 3707,
-	[BNXT_ULP_CLASS_HID_3802c] = 3708,
-	[BNXT_ULP_CLASS_HID_2121c] = 3709,
-	[BNXT_ULP_CLASS_HID_29f1c] = 3710,
-	[BNXT_ULP_CLASS_HID_3081c] = 3711,
-	[BNXT_ULP_CLASS_HID_3b51c] = 3712,
-	[BNXT_ULP_CLASS_HID_24088] = 3713,
-	[BNXT_ULP_CLASS_HID_2cd88] = 3714,
-	[BNXT_ULP_CLASS_HID_31b7c] = 3715,
-	[BNXT_ULP_CLASS_HID_3847c] = 3716,
-	[BNXT_ULP_CLASS_HID_22fd8] = 3717,
-	[BNXT_ULP_CLASS_HID_2d8d8] = 3718,
-	[BNXT_ULP_CLASS_HID_345d8] = 3719,
-	[BNXT_ULP_CLASS_HID_3938c] = 3720,
-	[BNXT_ULP_CLASS_HID_2288c] = 3721,
-	[BNXT_ULP_CLASS_HID_2d58c] = 3722,
-	[BNXT_ULP_CLASS_HID_35e8c] = 3723,
-	[BNXT_ULP_CLASS_HID_3cb8c] = 3724,
-	[BNXT_ULP_CLASS_HID_25d7c] = 3725,
-	[BNXT_ULP_CLASS_HID_2c67c] = 3726,
-	[BNXT_ULP_CLASS_HID_31430] = 3727,
-	[BNXT_ULP_CLASS_HID_38130] = 3728,
-	[BNXT_ULP_CLASS_HID_209d0] = 3729,
-	[BNXT_ULP_CLASS_HID_2b2d0] = 3730,
-	[BNXT_ULP_CLASS_HID_33fd0] = 3731,
-	[BNXT_ULP_CLASS_HID_3a8d0] = 3732,
-	[BNXT_ULP_CLASS_HID_214e0] = 3733,
-	[BNXT_ULP_CLASS_HID_281e0] = 3734,
-	[BNXT_ULP_CLASS_HID_30ae0] = 3735,
-	[BNXT_ULP_CLASS_HID_3b7e0] = 3736,
-	[BNXT_ULP_CLASS_HID_211d4] = 3737,
-	[BNXT_ULP_CLASS_HID_29ad4] = 3738,
-	[BNXT_ULP_CLASS_HID_307d4] = 3739,
-	[BNXT_ULP_CLASS_HID_3b0d4] = 3740,
-	[BNXT_ULP_CLASS_HID_20284] = 3741,
-	[BNXT_ULP_CLASS_HID_28f84] = 3742,
-	[BNXT_ULP_CLASS_HID_33884] = 3743,
-	[BNXT_ULP_CLASS_HID_3a584] = 3744,
-	[BNXT_ULP_CLASS_HID_22a24] = 3745,
-	[BNXT_ULP_CLASS_HID_2d724] = 3746,
-	[BNXT_ULP_CLASS_HID_34024] = 3747,
-	[BNXT_ULP_CLASS_HID_3cd24] = 3748,
-	[BNXT_ULP_CLASS_HID_23974] = 3749,
-	[BNXT_ULP_CLASS_HID_2a274] = 3750,
-	[BNXT_ULP_CLASS_HID_32f74] = 3751,
-	[BNXT_ULP_CLASS_HID_3d874] = 3752,
-	[BNXT_ULP_CLASS_HID_23228] = 3753,
-	[BNXT_ULP_CLASS_HID_2bf28] = 3754,
-	[BNXT_ULP_CLASS_HID_32828] = 3755,
-	[BNXT_ULP_CLASS_HID_3d528] = 3756,
-	[BNXT_ULP_CLASS_HID_22718] = 3757,
-	[BNXT_ULP_CLASS_HID_2d018] = 3758,
-	[BNXT_ULP_CLASS_HID_35d18] = 3759,
-	[BNXT_ULP_CLASS_HID_3c618] = 3760,
-	[BNXT_ULP_CLASS_HID_2136c] = 3761,
-	[BNXT_ULP_CLASS_HID_29c6c] = 3762,
-	[BNXT_ULP_CLASS_HID_3096c] = 3763,
-	[BNXT_ULP_CLASS_HID_3b26c] = 3764,
-	[BNXT_ULP_CLASS_HID_25dc8] = 3765,
-	[BNXT_ULP_CLASS_HID_2c6c8] = 3766,
-	[BNXT_ULP_CLASS_HID_314bc] = 3767,
-	[BNXT_ULP_CLASS_HID_381bc] = 3768,
-	[BNXT_ULP_CLASS_HID_256bc] = 3769,
-	[BNXT_ULP_CLASS_HID_2c3bc] = 3770,
-	[BNXT_ULP_CLASS_HID_31170] = 3771,
-	[BNXT_ULP_CLASS_HID_39a70] = 3772,
-	[BNXT_ULP_CLASS_HID_24b6c] = 3773,
-	[BNXT_ULP_CLASS_HID_29920] = 3774,
-	[BNXT_ULP_CLASS_HID_30220] = 3775,
-	[BNXT_ULP_CLASS_HID_38f20] = 3776,
-	[BNXT_ULP_CLASS_HID_22f54] = 3777,
-	[BNXT_ULP_CLASS_HID_2d854] = 3778,
-	[BNXT_ULP_CLASS_HID_34554] = 3779,
-	[BNXT_ULP_CLASS_HID_39308] = 3780,
-	[BNXT_ULP_CLASS_HID_23a64] = 3781,
-	[BNXT_ULP_CLASS_HID_2a764] = 3782,
-	[BNXT_ULP_CLASS_HID_35064] = 3783,
-	[BNXT_ULP_CLASS_HID_3dd64] = 3784,
-	[BNXT_ULP_CLASS_HID_23758] = 3785,
-	[BNXT_ULP_CLASS_HID_2a058] = 3786,
-	[BNXT_ULP_CLASS_HID_32d58] = 3787,
-	[BNXT_ULP_CLASS_HID_3d658] = 3788,
-	[BNXT_ULP_CLASS_HID_22808] = 3789,
-	[BNXT_ULP_CLASS_HID_2d508] = 3790,
-	[BNXT_ULP_CLASS_HID_35e08] = 3791,
-	[BNXT_ULP_CLASS_HID_3cb08] = 3792,
-	[BNXT_ULP_CLASS_HID_2149c] = 3793,
-	[BNXT_ULP_CLASS_HID_2819c] = 3794,
-	[BNXT_ULP_CLASS_HID_30a9c] = 3795,
-	[BNXT_ULP_CLASS_HID_3b79c] = 3796,
-	[BNXT_ULP_CLASS_HID_25ef8] = 3797,
-	[BNXT_ULP_CLASS_HID_2cbf8] = 3798,
-	[BNXT_ULP_CLASS_HID_319ac] = 3799,
-	[BNXT_ULP_CLASS_HID_382ac] = 3800,
-	[BNXT_ULP_CLASS_HID_25bac] = 3801,
-	[BNXT_ULP_CLASS_HID_2c4ac] = 3802,
-	[BNXT_ULP_CLASS_HID_31260] = 3803,
-	[BNXT_ULP_CLASS_HID_39f60] = 3804,
-	[BNXT_ULP_CLASS_HID_21150] = 3805,
-	[BNXT_ULP_CLASS_HID_29a50] = 3806,
-	[BNXT_ULP_CLASS_HID_30750] = 3807,
-	[BNXT_ULP_CLASS_HID_3b050] = 3808,
-	[BNXT_ULP_CLASS_HID_238f0] = 3809,
-	[BNXT_ULP_CLASS_HID_2a5f0] = 3810,
-	[BNXT_ULP_CLASS_HID_32ef0] = 3811,
-	[BNXT_ULP_CLASS_HID_3dbf0] = 3812,
-	[BNXT_ULP_CLASS_HID_20400] = 3813,
-	[BNXT_ULP_CLASS_HID_2b100] = 3814,
-	[BNXT_ULP_CLASS_HID_33a00] = 3815,
-	[BNXT_ULP_CLASS_HID_3a700] = 3816,
-	[BNXT_ULP_CLASS_HID_200f4] = 3817,
-	[BNXT_ULP_CLASS_HID_28df4] = 3818,
-	[BNXT_ULP_CLASS_HID_336f4] = 3819,
-	[BNXT_ULP_CLASS_HID_3a3f4] = 3820,
-	[BNXT_ULP_CLASS_HID_235a4] = 3821,
-	[BNXT_ULP_CLASS_HID_2bea4] = 3822,
-	[BNXT_ULP_CLASS_HID_32ba4] = 3823,
-	[BNXT_ULP_CLASS_HID_3d4a4] = 3824,
-	[BNXT_ULP_CLASS_HID_25d44] = 3825,
-	[BNXT_ULP_CLASS_HID_2c644] = 3826,
-	[BNXT_ULP_CLASS_HID_31438] = 3827,
-	[BNXT_ULP_CLASS_HID_38138] = 3828,
-	[BNXT_ULP_CLASS_HID_22894] = 3829,
-	[BNXT_ULP_CLASS_HID_2d594] = 3830,
-	[BNXT_ULP_CLASS_HID_35e94] = 3831,
-	[BNXT_ULP_CLASS_HID_3cb94] = 3832,
-	[BNXT_ULP_CLASS_HID_22548] = 3833,
-	[BNXT_ULP_CLASS_HID_2ae48] = 3834,
-	[BNXT_ULP_CLASS_HID_35b48] = 3835,
-	[BNXT_ULP_CLASS_HID_3c448] = 3836,
-	[BNXT_ULP_CLASS_HID_25638] = 3837,
-	[BNXT_ULP_CLASS_HID_2c338] = 3838,
-	[BNXT_ULP_CLASS_HID_310ec] = 3839,
-	[BNXT_ULP_CLASS_HID_39dec] = 3840,
-	[BNXT_ULP_CLASS_HID_22998] = 3841,
-	[BNXT_ULP_CLASS_HID_2d298] = 3842,
-	[BNXT_ULP_CLASS_HID_35f98] = 3843,
-	[BNXT_ULP_CLASS_HID_3c898] = 3844,
-	[BNXT_ULP_CLASS_HID_234a8] = 3845,
-	[BNXT_ULP_CLASS_HID_2a1a8] = 3846,
-	[BNXT_ULP_CLASS_HID_32aa8] = 3847,
-	[BNXT_ULP_CLASS_HID_3d7a8] = 3848,
-	[BNXT_ULP_CLASS_HID_2319c] = 3849,
-	[BNXT_ULP_CLASS_HID_2ba9c] = 3850,
-	[BNXT_ULP_CLASS_HID_3279c] = 3851,
-	[BNXT_ULP_CLASS_HID_3d09c] = 3852,
-	[BNXT_ULP_CLASS_HID_2224c] = 3853,
-	[BNXT_ULP_CLASS_HID_2af4c] = 3854,
-	[BNXT_ULP_CLASS_HID_3584c] = 3855,
-	[BNXT_ULP_CLASS_HID_3c54c] = 3856,
-	[BNXT_ULP_CLASS_HID_24dec] = 3857,
-	[BNXT_ULP_CLASS_HID_29ba0] = 3858,
-	[BNXT_ULP_CLASS_HID_304a0] = 3859,
-	[BNXT_ULP_CLASS_HID_3b1a0] = 3860,
-	[BNXT_ULP_CLASS_HID_2593c] = 3861,
-	[BNXT_ULP_CLASS_HID_2c23c] = 3862,
-	[BNXT_ULP_CLASS_HID_313f0] = 3863,
-	[BNXT_ULP_CLASS_HID_39cf0] = 3864,
-	[BNXT_ULP_CLASS_HID_255f0] = 3865,
-	[BNXT_ULP_CLASS_HID_2def0] = 3866,
-	[BNXT_ULP_CLASS_HID_34bf0] = 3867,
-	[BNXT_ULP_CLASS_HID_399a4] = 3868,
-	[BNXT_ULP_CLASS_HID_246a0] = 3869,
-	[BNXT_ULP_CLASS_HID_29494] = 3870,
-	[BNXT_ULP_CLASS_HID_30194] = 3871,
-	[BNXT_ULP_CLASS_HID_38a94] = 3872,
-	[BNXT_ULP_CLASS_HID_23334] = 3873,
-	[BNXT_ULP_CLASS_HID_2bc34] = 3874,
-	[BNXT_ULP_CLASS_HID_32934] = 3875,
-	[BNXT_ULP_CLASS_HID_3d234] = 3876,
-	[BNXT_ULP_CLASS_HID_21e44] = 3877,
-	[BNXT_ULP_CLASS_HID_28b44] = 3878,
-	[BNXT_ULP_CLASS_HID_33444] = 3879,
-	[BNXT_ULP_CLASS_HID_3a144] = 3880,
-	[BNXT_ULP_CLASS_HID_21b38] = 3881,
-	[BNXT_ULP_CLASS_HID_28438] = 3882,
-	[BNXT_ULP_CLASS_HID_33138] = 3883,
-	[BNXT_ULP_CLASS_HID_3ba38] = 3884,
-	[BNXT_ULP_CLASS_HID_20fe8] = 3885,
-	[BNXT_ULP_CLASS_HID_2b8e8] = 3886,
-	[BNXT_ULP_CLASS_HID_325e8] = 3887,
-	[BNXT_ULP_CLASS_HID_3aee8] = 3888,
-	[BNXT_ULP_CLASS_HID_25788] = 3889,
-	[BNXT_ULP_CLASS_HID_2c088] = 3890,
-	[BNXT_ULP_CLASS_HID_34d88] = 3891,
-	[BNXT_ULP_CLASS_HID_39b7c] = 3892,
-	[BNXT_ULP_CLASS_HID_222d8] = 3893,
-	[BNXT_ULP_CLASS_HID_2afd8] = 3894,
-	[BNXT_ULP_CLASS_HID_358d8] = 3895,
-	[BNXT_ULP_CLASS_HID_3c5d8] = 3896,
-	[BNXT_ULP_CLASS_HID_23f8c] = 3897,
-	[BNXT_ULP_CLASS_HID_2a88c] = 3898,
-	[BNXT_ULP_CLASS_HID_3558c] = 3899,
-	[BNXT_ULP_CLASS_HID_3de8c] = 3900,
-	[BNXT_ULP_CLASS_HID_2507c] = 3901,
-	[BNXT_ULP_CLASS_HID_2dd7c] = 3902,
-	[BNXT_ULP_CLASS_HID_3467c] = 3903,
-	[BNXT_ULP_CLASS_HID_39430] = 3904,
-	[BNXT_ULP_CLASS_HID_223dc] = 3905,
-	[BNXT_ULP_CLASS_HID_2acdc] = 3906,
-	[BNXT_ULP_CLASS_HID_359dc] = 3907,
-	[BNXT_ULP_CLASS_HID_3c2dc] = 3908,
-	[BNXT_ULP_CLASS_HID_20eec] = 3909,
-	[BNXT_ULP_CLASS_HID_2bbec] = 3910,
-	[BNXT_ULP_CLASS_HID_324ec] = 3911,
-	[BNXT_ULP_CLASS_HID_3d1ec] = 3912,
-	[BNXT_ULP_CLASS_HID_20ba0] = 3913,
-	[BNXT_ULP_CLASS_HID_2b4a0] = 3914,
-	[BNXT_ULP_CLASS_HID_321a0] = 3915,
-	[BNXT_ULP_CLASS_HID_3aaa0] = 3916,
-	[BNXT_ULP_CLASS_HID_23c90] = 3917,
-	[BNXT_ULP_CLASS_HID_2a990] = 3918,
-	[BNXT_ULP_CLASS_HID_35290] = 3919,
-	[BNXT_ULP_CLASS_HID_3df90] = 3920,
-	[BNXT_ULP_CLASS_HID_24430] = 3921,
-	[BNXT_ULP_CLASS_HID_295e4] = 3922,
-	[BNXT_ULP_CLASS_HID_31ee4] = 3923,
-	[BNXT_ULP_CLASS_HID_38be4] = 3924,
-	[BNXT_ULP_CLASS_HID_25340] = 3925,
-	[BNXT_ULP_CLASS_HID_2dc40] = 3926,
-	[BNXT_ULP_CLASS_HID_34940] = 3927,
-	[BNXT_ULP_CLASS_HID_39734] = 3928,
-	[BNXT_ULP_CLASS_HID_22c34] = 3929,
-	[BNXT_ULP_CLASS_HID_2d934] = 3930,
-	[BNXT_ULP_CLASS_HID_34234] = 3931,
-	[BNXT_ULP_CLASS_HID_393e8] = 3932,
-	[BNXT_ULP_CLASS_HID_240e4] = 3933,
-	[BNXT_ULP_CLASS_HID_2cde4] = 3934,
-	[BNXT_ULP_CLASS_HID_31bd8] = 3935,
-	[BNXT_ULP_CLASS_HID_384d8] = 3936,
-	[BNXT_ULP_CLASS_HID_23de0] = 3937,
-	[BNXT_ULP_CLASS_HID_2a6e0] = 3938,
-	[BNXT_ULP_CLASS_HID_353e0] = 3939,
-	[BNXT_ULP_CLASS_HID_3dce0] = 3940,
-	[BNXT_ULP_CLASS_HID_20930] = 3941,
-	[BNXT_ULP_CLASS_HID_2b230] = 3942,
-	[BNXT_ULP_CLASS_HID_33f30] = 3943,
-	[BNXT_ULP_CLASS_HID_3a830] = 3944,
-	[BNXT_ULP_CLASS_HID_205e4] = 3945,
-	[BNXT_ULP_CLASS_HID_28ee4] = 3946,
-	[BNXT_ULP_CLASS_HID_33be4] = 3947,
-	[BNXT_ULP_CLASS_HID_3a4e4] = 3948,
-	[BNXT_ULP_CLASS_HID_236d4] = 3949,
-	[BNXT_ULP_CLASS_HID_2a3d4] = 3950,
-	[BNXT_ULP_CLASS_HID_32cd4] = 3951,
-	[BNXT_ULP_CLASS_HID_3d9d4] = 3952,
-	[BNXT_ULP_CLASS_HID_25e74] = 3953,
-	[BNXT_ULP_CLASS_HID_2cb74] = 3954,
-	[BNXT_ULP_CLASS_HID_31928] = 3955,
-	[BNXT_ULP_CLASS_HID_38228] = 3956,
-	[BNXT_ULP_CLASS_HID_22d84] = 3957,
-	[BNXT_ULP_CLASS_HID_2d684] = 3958,
-	[BNXT_ULP_CLASS_HID_34384] = 3959,
-	[BNXT_ULP_CLASS_HID_39178] = 3960,
-	[BNXT_ULP_CLASS_HID_22678] = 3961,
-	[BNXT_ULP_CLASS_HID_2d378] = 3962,
-	[BNXT_ULP_CLASS_HID_35c78] = 3963,
-	[BNXT_ULP_CLASS_HID_3c978] = 3964,
-	[BNXT_ULP_CLASS_HID_25b28] = 3965,
-	[BNXT_ULP_CLASS_HID_2c428] = 3966,
-	[BNXT_ULP_CLASS_HID_3121c] = 3967,
-	[BNXT_ULP_CLASS_HID_39f1c] = 3968,
-	[BNXT_ULP_CLASS_HID_3488] = 3969,
-	[BNXT_ULP_CLASS_HID_3a44] = 3970,
-	[BNXT_ULP_CLASS_HID_0994] = 3971,
-	[BNXT_ULP_CLASS_HID_5ed8] = 3972,
-	[BNXT_ULP_CLASS_HID_2de8] = 3973,
-	[BNXT_ULP_CLASS_HID_07e0] = 3974,
-	[BNXT_ULP_CLASS_HID_1330] = 3975,
-	[BNXT_ULP_CLASS_HID_2874] = 3976,
-	[BNXT_ULP_CLASS_HID_3784] = 3977,
-	[BNXT_ULP_CLASS_HID_03d8] = 3978,
-	[BNXT_ULP_CLASS_HID_591c] = 3979,
-	[BNXT_ULP_CLASS_HID_242c] = 3980,
-	[BNXT_ULP_CLASS_HID_1e24] = 3981,
-	[BNXT_ULP_CLASS_HID_4880] = 3982,
-	[BNXT_ULP_CLASS_HID_22b8] = 3983,
-	[BNXT_ULP_CLASS_HID_31c8] = 3984
+	[BNXT_ULP_CLASS_HID_05d1] = 1,
+	[BNXT_ULP_CLASS_HID_1229] = 2,
+	[BNXT_ULP_CLASS_HID_0bed] = 3,
+	[BNXT_ULP_CLASS_HID_1865] = 4,
+	[BNXT_ULP_CLASS_HID_25c9] = 5,
+	[BNXT_ULP_CLASS_HID_3241] = 6,
+	[BNXT_ULP_CLASS_HID_2c05] = 7,
+	[BNXT_ULP_CLASS_HID_389d] = 8,
+	[BNXT_ULP_CLASS_HID_3c3d] = 9,
+	[BNXT_ULP_CLASS_HID_48b5] = 10,
+	[BNXT_ULP_CLASS_HID_4279] = 11,
+	[BNXT_ULP_CLASS_HID_4ef1] = 12,
+	[BNXT_ULP_CLASS_HID_5c55] = 13,
+	[BNXT_ULP_CLASS_HID_0be1] = 14,
+	[BNXT_ULP_CLASS_HID_05a5] = 15,
+	[BNXT_ULP_CLASS_HID_123d] = 16,
+	[BNXT_ULP_CLASS_HID_4142d] = 17,
+	[BNXT_ULP_CLASS_HID_42095] = 18,
+	[BNXT_ULP_CLASS_HID_41a69] = 19,
+	[BNXT_ULP_CLASS_HID_426d1] = 20,
+	[BNXT_ULP_CLASS_HID_44a99] = 21,
+	[BNXT_ULP_CLASS_HID_45701] = 22,
+	[BNXT_ULP_CLASS_HID_450c5] = 23,
+	[BNXT_ULP_CLASS_HID_40071] = 24,
+	[BNXT_ULP_CLASS_HID_40a85] = 25,
+	[BNXT_ULP_CLASS_HID_4170d] = 26,
+	[BNXT_ULP_CLASS_HID_410c1] = 27,
+	[BNXT_ULP_CLASS_HID_41d49] = 28,
+	[BNXT_ULP_CLASS_HID_440f1] = 29,
+	[BNXT_ULP_CLASS_HID_44d79] = 30,
+	[BNXT_ULP_CLASS_HID_4473d] = 31,
+	[BNXT_ULP_CLASS_HID_453a5] = 32,
+	[BNXT_ULP_CLASS_HID_244e3] = 33,
+	[BNXT_ULP_CLASS_HID_2517b] = 34,
+	[BNXT_ULP_CLASS_HID_24b3f] = 35,
+	[BNXT_ULP_CLASS_HID_257b7] = 36,
+	[BNXT_ULP_CLASS_HID_22f5f] = 37,
+	[BNXT_ULP_CLASS_HID_23bd7] = 38,
+	[BNXT_ULP_CLASS_HID_2359b] = 39,
+	[BNXT_ULP_CLASS_HID_24213] = 40,
+	[BNXT_ULP_CLASS_HID_20bab] = 41,
+	[BNXT_ULP_CLASS_HID_21823] = 42,
+	[BNXT_ULP_CLASS_HID_211e7] = 43,
+	[BNXT_ULP_CLASS_HID_21e7f] = 44,
+	[BNXT_ULP_CLASS_HID_252f3] = 45,
+	[BNXT_ULP_CLASS_HID_2029f] = 46,
+	[BNXT_ULP_CLASS_HID_2590f] = 47,
+	[BNXT_ULP_CLASS_HID_208db] = 48,
+	[BNXT_ULP_CLASS_HID_231d3] = 49,
+	[BNXT_ULP_CLASS_HID_23e2b] = 50,
+	[BNXT_ULP_CLASS_HID_237ef] = 51,
+	[BNXT_ULP_CLASS_HID_24467] = 52,
+	[BNXT_ULP_CLASS_HID_21c0f] = 53,
+	[BNXT_ULP_CLASS_HID_22887] = 54,
+	[BNXT_ULP_CLASS_HID_2224b] = 55,
+	[BNXT_ULP_CLASS_HID_22ec3] = 56,
+	[BNXT_ULP_CLASS_HID_25547] = 57,
+	[BNXT_ULP_CLASS_HID_20513] = 58,
+	[BNXT_ULP_CLASS_HID_25b83] = 59,
+	[BNXT_ULP_CLASS_HID_20b2f] = 60,
+	[BNXT_ULP_CLASS_HID_23fa3] = 61,
+	[BNXT_ULP_CLASS_HID_24c3b] = 62,
+	[BNXT_ULP_CLASS_HID_245ff] = 63,
+	[BNXT_ULP_CLASS_HID_25277] = 64,
+	[BNXT_ULP_CLASS_HID_64037] = 65,
+	[BNXT_ULP_CLASS_HID_64c8f] = 66,
+	[BNXT_ULP_CLASS_HID_64673] = 67,
+	[BNXT_ULP_CLASS_HID_652cb] = 68,
+	[BNXT_ULP_CLASS_HID_62a93] = 69,
+	[BNXT_ULP_CLASS_HID_636eb] = 70,
+	[BNXT_ULP_CLASS_HID_630af] = 71,
+	[BNXT_ULP_CLASS_HID_63d27] = 72,
+	[BNXT_ULP_CLASS_HID_606ff] = 73,
+	[BNXT_ULP_CLASS_HID_61377] = 74,
+	[BNXT_ULP_CLASS_HID_60d3b] = 75,
+	[BNXT_ULP_CLASS_HID_619b3] = 76,
+	[BNXT_ULP_CLASS_HID_64e07] = 77,
+	[BNXT_ULP_CLASS_HID_65a9f] = 78,
+	[BNXT_ULP_CLASS_HID_65443] = 79,
+	[BNXT_ULP_CLASS_HID_603ef] = 80,
+	[BNXT_ULP_CLASS_HID_62ce7] = 81,
+	[BNXT_ULP_CLASS_HID_6397f] = 82,
+	[BNXT_ULP_CLASS_HID_63323] = 83,
+	[BNXT_ULP_CLASS_HID_63fbb] = 84,
+	[BNXT_ULP_CLASS_HID_61743] = 85,
+	[BNXT_ULP_CLASS_HID_623db] = 86,
+	[BNXT_ULP_CLASS_HID_61d9f] = 87,
+	[BNXT_ULP_CLASS_HID_62a17] = 88,
+	[BNXT_ULP_CLASS_HID_6509b] = 89,
+	[BNXT_ULP_CLASS_HID_60027] = 90,
+	[BNXT_ULP_CLASS_HID_656d7] = 91,
+	[BNXT_ULP_CLASS_HID_60663] = 92,
+	[BNXT_ULP_CLASS_HID_63af7] = 93,
+	[BNXT_ULP_CLASS_HID_6474f] = 94,
+	[BNXT_ULP_CLASS_HID_64133] = 95,
+	[BNXT_ULP_CLASS_HID_64d8b] = 96,
+	[BNXT_ULP_CLASS_HID_a3fb] = 97,
+	[BNXT_ULP_CLASS_HID_b063] = 98,
+	[BNXT_ULP_CLASS_HID_aa27] = 99,
+	[BNXT_ULP_CLASS_HID_b6af] = 100,
+	[BNXT_ULP_CLASS_HID_8e47] = 101,
+	[BNXT_ULP_CLASS_HID_9acf] = 102,
+	[BNXT_ULP_CLASS_HID_9483] = 103,
+	[BNXT_ULP_CLASS_HID_a10b] = 104,
+	[BNXT_ULP_CLASS_HID_c78f] = 105,
+	[BNXT_ULP_CLASS_HID_d3f7] = 106,
+	[BNXT_ULP_CLASS_HID_cdcb] = 107,
+	[BNXT_ULP_CLASS_HID_da33] = 108,
+	[BNXT_ULP_CLASS_HID_b1eb] = 109,
+	[BNXT_ULP_CLASS_HID_be53] = 110,
+	[BNXT_ULP_CLASS_HID_b817] = 111,
+	[BNXT_ULP_CLASS_HID_c49f] = 112,
+	[BNXT_ULP_CLASS_HID_49f2f] = 113,
+	[BNXT_ULP_CLASS_HID_4ab97] = 114,
+	[BNXT_ULP_CLASS_HID_4a56b] = 115,
+	[BNXT_ULP_CLASS_HID_4b1d3] = 116,
+	[BNXT_ULP_CLASS_HID_4898b] = 117,
+	[BNXT_ULP_CLASS_HID_495f3] = 118,
+	[BNXT_ULP_CLASS_HID_48fb7] = 119,
+	[BNXT_ULP_CLASS_HID_49c3f] = 120,
+	[BNXT_ULP_CLASS_HID_4c2b3] = 121,
+	[BNXT_ULP_CLASS_HID_4cf3b] = 122,
+	[BNXT_ULP_CLASS_HID_4c8ff] = 123,
+	[BNXT_ULP_CLASS_HID_4d567] = 124,
+	[BNXT_ULP_CLASS_HID_4ad1f] = 125,
+	[BNXT_ULP_CLASS_HID_4b987] = 126,
+	[BNXT_ULP_CLASS_HID_4b35b] = 127,
+	[BNXT_ULP_CLASS_HID_4bfc3] = 128,
+	[BNXT_ULP_CLASS_HID_1b9fb] = 129,
+	[BNXT_ULP_CLASS_HID_1c663] = 130,
+	[BNXT_ULP_CLASS_HID_1c027] = 131,
+	[BNXT_ULP_CLASS_HID_1ccaf] = 132,
+	[BNXT_ULP_CLASS_HID_1a447] = 133,
+	[BNXT_ULP_CLASS_HID_1b0cf] = 134,
+	[BNXT_ULP_CLASS_HID_1aa83] = 135,
+	[BNXT_ULP_CLASS_HID_1b70b] = 136,
+	[BNXT_ULP_CLASS_HID_180b3] = 137,
+	[BNXT_ULP_CLASS_HID_18d3b] = 138,
+	[BNXT_ULP_CLASS_HID_186ff] = 139,
+	[BNXT_ULP_CLASS_HID_19367] = 140,
+	[BNXT_ULP_CLASS_HID_1c7eb] = 141,
+	[BNXT_ULP_CLASS_HID_1d453] = 142,
+	[BNXT_ULP_CLASS_HID_1ce17] = 143,
+	[BNXT_ULP_CLASS_HID_1da9f] = 144,
+	[BNXT_ULP_CLASS_HID_5b52f] = 145,
+	[BNXT_ULP_CLASS_HID_5c197] = 146,
+	[BNXT_ULP_CLASS_HID_5bb6b] = 147,
+	[BNXT_ULP_CLASS_HID_5c7d3] = 148,
+	[BNXT_ULP_CLASS_HID_59f8b] = 149,
+	[BNXT_ULP_CLASS_HID_5abf3] = 150,
+	[BNXT_ULP_CLASS_HID_5a5b7] = 151,
+	[BNXT_ULP_CLASS_HID_5b23f] = 152,
+	[BNXT_ULP_CLASS_HID_5d8b3] = 153,
+	[BNXT_ULP_CLASS_HID_5886f] = 154,
+	[BNXT_ULP_CLASS_HID_58223] = 155,
+	[BNXT_ULP_CLASS_HID_58eab] = 156,
+	[BNXT_ULP_CLASS_HID_5c31f] = 157,
+	[BNXT_ULP_CLASS_HID_5cf87] = 158,
+	[BNXT_ULP_CLASS_HID_5c95b] = 159,
+	[BNXT_ULP_CLASS_HID_5d5c3] = 160,
+	[BNXT_ULP_CLASS_HID_05f1] = 161,
+	[BNXT_ULP_CLASS_HID_1209] = 162,
+	[BNXT_ULP_CLASS_HID_0bcd] = 163,
+	[BNXT_ULP_CLASS_HID_1845] = 164,
+	[BNXT_ULP_CLASS_HID_25e9] = 165,
+	[BNXT_ULP_CLASS_HID_3261] = 166,
+	[BNXT_ULP_CLASS_HID_2c25] = 167,
+	[BNXT_ULP_CLASS_HID_38bd] = 168,
+	[BNXT_ULP_CLASS_HID_3c1d] = 169,
+	[BNXT_ULP_CLASS_HID_4895] = 170,
+	[BNXT_ULP_CLASS_HID_4259] = 171,
+	[BNXT_ULP_CLASS_HID_4ed1] = 172,
+	[BNXT_ULP_CLASS_HID_5c75] = 173,
+	[BNXT_ULP_CLASS_HID_0bc1] = 174,
+	[BNXT_ULP_CLASS_HID_0585] = 175,
+	[BNXT_ULP_CLASS_HID_121d] = 176,
+	[BNXT_ULP_CLASS_HID_58c5] = 177,
+	[BNXT_ULP_CLASS_HID_0891] = 178,
+	[BNXT_ULP_CLASS_HID_0255] = 179,
+	[BNXT_ULP_CLASS_HID_0eed] = 180,
+	[BNXT_ULP_CLASS_HID_1c71] = 181,
+	[BNXT_ULP_CLASS_HID_2889] = 182,
+	[BNXT_ULP_CLASS_HID_224d] = 183,
+	[BNXT_ULP_CLASS_HID_2ec5] = 184,
+	[BNXT_ULP_CLASS_HID_32a5] = 185,
+	[BNXT_ULP_CLASS_HID_3f3d] = 186,
+	[BNXT_ULP_CLASS_HID_38e1] = 187,
+	[BNXT_ULP_CLASS_HID_4579] = 188,
+	[BNXT_ULP_CLASS_HID_529d] = 189,
+	[BNXT_ULP_CLASS_HID_0269] = 190,
+	[BNXT_ULP_CLASS_HID_58d9] = 191,
+	[BNXT_ULP_CLASS_HID_08a5] = 192,
+	[BNXT_ULP_CLASS_HID_400c5] = 193,
+	[BNXT_ULP_CLASS_HID_40d5d] = 194,
+	[BNXT_ULP_CLASS_HID_40701] = 195,
+	[BNXT_ULP_CLASS_HID_41399] = 196,
+	[BNXT_ULP_CLASS_HID_4213d] = 197,
+	[BNXT_ULP_CLASS_HID_42db5] = 198,
+	[BNXT_ULP_CLASS_HID_42779] = 199,
+	[BNXT_ULP_CLASS_HID_433f1] = 200,
+	[BNXT_ULP_CLASS_HID_43751] = 201,
+	[BNXT_ULP_CLASS_HID_443e9] = 202,
+	[BNXT_ULP_CLASS_HID_43dad] = 203,
+	[BNXT_ULP_CLASS_HID_44a25] = 204,
+	[BNXT_ULP_CLASS_HID_45749] = 205,
+	[BNXT_ULP_CLASS_HID_40715] = 206,
+	[BNXT_ULP_CLASS_HID_400d9] = 207,
+	[BNXT_ULP_CLASS_HID_40d51] = 208,
+	[BNXT_ULP_CLASS_HID_45419] = 209,
+	[BNXT_ULP_CLASS_HID_403e5] = 210,
+	[BNXT_ULP_CLASS_HID_45a55] = 211,
+	[BNXT_ULP_CLASS_HID_40a21] = 212,
+	[BNXT_ULP_CLASS_HID_41745] = 213,
+	[BNXT_ULP_CLASS_HID_423dd] = 214,
+	[BNXT_ULP_CLASS_HID_41d81] = 215,
+	[BNXT_ULP_CLASS_HID_42a19] = 216,
+	[BNXT_ULP_CLASS_HID_42df9] = 217,
+	[BNXT_ULP_CLASS_HID_43a71] = 218,
+	[BNXT_ULP_CLASS_HID_43435] = 219,
+	[BNXT_ULP_CLASS_HID_4404d] = 220,
+	[BNXT_ULP_CLASS_HID_44dd1] = 221,
+	[BNXT_ULP_CLASS_HID_45a69] = 222,
+	[BNXT_ULP_CLASS_HID_4542d] = 223,
+	[BNXT_ULP_CLASS_HID_403f9] = 224,
+	[BNXT_ULP_CLASS_HID_4140d] = 225,
+	[BNXT_ULP_CLASS_HID_420b5] = 226,
+	[BNXT_ULP_CLASS_HID_41a49] = 227,
+	[BNXT_ULP_CLASS_HID_426f1] = 228,
+	[BNXT_ULP_CLASS_HID_44ab9] = 229,
+	[BNXT_ULP_CLASS_HID_45721] = 230,
+	[BNXT_ULP_CLASS_HID_450e5] = 231,
+	[BNXT_ULP_CLASS_HID_40051] = 232,
+	[BNXT_ULP_CLASS_HID_40aa5] = 233,
+	[BNXT_ULP_CLASS_HID_4172d] = 234,
+	[BNXT_ULP_CLASS_HID_410e1] = 235,
+	[BNXT_ULP_CLASS_HID_41d69] = 236,
+	[BNXT_ULP_CLASS_HID_440d1] = 237,
+	[BNXT_ULP_CLASS_HID_44d59] = 238,
+	[BNXT_ULP_CLASS_HID_4471d] = 239,
+	[BNXT_ULP_CLASS_HID_45385] = 240,
+	[BNXT_ULP_CLASS_HID_6400d] = 241,
+	[BNXT_ULP_CLASS_HID_64cb5] = 242,
+	[BNXT_ULP_CLASS_HID_64649] = 243,
+	[BNXT_ULP_CLASS_HID_652f1] = 244,
+	[BNXT_ULP_CLASS_HID_619ed] = 245,
+	[BNXT_ULP_CLASS_HID_62615] = 246,
+	[BNXT_ULP_CLASS_HID_62029] = 247,
+	[BNXT_ULP_CLASS_HID_62c51] = 248,
+	[BNXT_ULP_CLASS_HID_636a5] = 249,
+	[BNXT_ULP_CLASS_HID_6432d] = 250,
+	[BNXT_ULP_CLASS_HID_63ce1] = 251,
+	[BNXT_ULP_CLASS_HID_64969] = 252,
+	[BNXT_ULP_CLASS_HID_61005] = 253,
+	[BNXT_ULP_CLASS_HID_61c8d] = 254,
+	[BNXT_ULP_CLASS_HID_61641] = 255,
+	[BNXT_ULP_CLASS_HID_622c9] = 256,
+	[BNXT_ULP_CLASS_HID_52a0d] = 257,
+	[BNXT_ULP_CLASS_HID_536b5] = 258,
+	[BNXT_ULP_CLASS_HID_53049] = 259,
+	[BNXT_ULP_CLASS_HID_53cf1] = 260,
+	[BNXT_ULP_CLASS_HID_503ed] = 261,
+	[BNXT_ULP_CLASS_HID_51015] = 262,
+	[BNXT_ULP_CLASS_HID_50a29] = 263,
+	[BNXT_ULP_CLASS_HID_51651] = 264,
+	[BNXT_ULP_CLASS_HID_520a5] = 265,
+	[BNXT_ULP_CLASS_HID_52d2d] = 266,
+	[BNXT_ULP_CLASS_HID_526e1] = 267,
+	[BNXT_ULP_CLASS_HID_53369] = 268,
+	[BNXT_ULP_CLASS_HID_556d1] = 269,
+	[BNXT_ULP_CLASS_HID_5068d] = 270,
+	[BNXT_ULP_CLASS_HID_50041] = 271,
+	[BNXT_ULP_CLASS_HID_50cc9] = 272,
+	[BNXT_ULP_CLASS_HID_7560d] = 273,
+	[BNXT_ULP_CLASS_HID_705f9] = 274,
+	[BNXT_ULP_CLASS_HID_75c49] = 275,
+	[BNXT_ULP_CLASS_HID_70c25] = 276,
+	[BNXT_ULP_CLASS_HID_72fed] = 277,
+	[BNXT_ULP_CLASS_HID_73c15] = 278,
+	[BNXT_ULP_CLASS_HID_73629] = 279,
+	[BNXT_ULP_CLASS_HID_74251] = 280,
+	[BNXT_ULP_CLASS_HID_74ca5] = 281,
+	[BNXT_ULP_CLASS_HID_7592d] = 282,
+	[BNXT_ULP_CLASS_HID_752e1] = 283,
+	[BNXT_ULP_CLASS_HID_7025d] = 284,
+	[BNXT_ULP_CLASS_HID_72605] = 285,
+	[BNXT_ULP_CLASS_HID_7328d] = 286,
+	[BNXT_ULP_CLASS_HID_72c41] = 287,
+	[BNXT_ULP_CLASS_HID_738c9] = 288,
+	[BNXT_ULP_CLASS_HID_0591] = 289,
+	[BNXT_ULP_CLASS_HID_1269] = 290,
+	[BNXT_ULP_CLASS_HID_0bad] = 291,
+	[BNXT_ULP_CLASS_HID_1825] = 292,
+	[BNXT_ULP_CLASS_HID_2589] = 293,
+	[BNXT_ULP_CLASS_HID_3201] = 294,
+	[BNXT_ULP_CLASS_HID_2c45] = 295,
+	[BNXT_ULP_CLASS_HID_38dd] = 296,
+	[BNXT_ULP_CLASS_HID_3c7d] = 297,
+	[BNXT_ULP_CLASS_HID_48f5] = 298,
+	[BNXT_ULP_CLASS_HID_4239] = 299,
+	[BNXT_ULP_CLASS_HID_4eb1] = 300,
+	[BNXT_ULP_CLASS_HID_5c15] = 301,
+	[BNXT_ULP_CLASS_HID_0ba1] = 302,
+	[BNXT_ULP_CLASS_HID_05e5] = 303,
+	[BNXT_ULP_CLASS_HID_127d] = 304,
+	[BNXT_ULP_CLASS_HID_58a5] = 305,
+	[BNXT_ULP_CLASS_HID_08f1] = 306,
+	[BNXT_ULP_CLASS_HID_0235] = 307,
+	[BNXT_ULP_CLASS_HID_0e8d] = 308,
+	[BNXT_ULP_CLASS_HID_1c11] = 309,
+	[BNXT_ULP_CLASS_HID_28e9] = 310,
+	[BNXT_ULP_CLASS_HID_222d] = 311,
+	[BNXT_ULP_CLASS_HID_2ea5] = 312,
+	[BNXT_ULP_CLASS_HID_32c5] = 313,
+	[BNXT_ULP_CLASS_HID_3f5d] = 314,
+	[BNXT_ULP_CLASS_HID_3881] = 315,
+	[BNXT_ULP_CLASS_HID_4519] = 316,
+	[BNXT_ULP_CLASS_HID_52fd] = 317,
+	[BNXT_ULP_CLASS_HID_0209] = 318,
+	[BNXT_ULP_CLASS_HID_58b9] = 319,
+	[BNXT_ULP_CLASS_HID_08c5] = 320,
+	[BNXT_ULP_CLASS_HID_400a5] = 321,
+	[BNXT_ULP_CLASS_HID_40d3d] = 322,
+	[BNXT_ULP_CLASS_HID_40761] = 323,
+	[BNXT_ULP_CLASS_HID_413f9] = 324,
+	[BNXT_ULP_CLASS_HID_4215d] = 325,
+	[BNXT_ULP_CLASS_HID_42dd5] = 326,
+	[BNXT_ULP_CLASS_HID_42719] = 327,
+	[BNXT_ULP_CLASS_HID_43391] = 328,
+	[BNXT_ULP_CLASS_HID_43731] = 329,
+	[BNXT_ULP_CLASS_HID_44389] = 330,
+	[BNXT_ULP_CLASS_HID_43dcd] = 331,
+	[BNXT_ULP_CLASS_HID_44a45] = 332,
+	[BNXT_ULP_CLASS_HID_45729] = 333,
+	[BNXT_ULP_CLASS_HID_40775] = 334,
+	[BNXT_ULP_CLASS_HID_400b9] = 335,
+	[BNXT_ULP_CLASS_HID_40d31] = 336,
+	[BNXT_ULP_CLASS_HID_45479] = 337,
+	[BNXT_ULP_CLASS_HID_40385] = 338,
+	[BNXT_ULP_CLASS_HID_45a35] = 339,
+	[BNXT_ULP_CLASS_HID_40a41] = 340,
+	[BNXT_ULP_CLASS_HID_41725] = 341,
+	[BNXT_ULP_CLASS_HID_423bd] = 342,
+	[BNXT_ULP_CLASS_HID_41de1] = 343,
+	[BNXT_ULP_CLASS_HID_42a79] = 344,
+	[BNXT_ULP_CLASS_HID_42d99] = 345,
+	[BNXT_ULP_CLASS_HID_43a11] = 346,
+	[BNXT_ULP_CLASS_HID_43455] = 347,
+	[BNXT_ULP_CLASS_HID_4402d] = 348,
+	[BNXT_ULP_CLASS_HID_44db1] = 349,
+	[BNXT_ULP_CLASS_HID_45a09] = 350,
+	[BNXT_ULP_CLASS_HID_4544d] = 351,
+	[BNXT_ULP_CLASS_HID_40399] = 352,
+	[BNXT_ULP_CLASS_HID_4146d] = 353,
+	[BNXT_ULP_CLASS_HID_420d5] = 354,
+	[BNXT_ULP_CLASS_HID_41a29] = 355,
+	[BNXT_ULP_CLASS_HID_42691] = 356,
+	[BNXT_ULP_CLASS_HID_44ad9] = 357,
+	[BNXT_ULP_CLASS_HID_45741] = 358,
+	[BNXT_ULP_CLASS_HID_45085] = 359,
+	[BNXT_ULP_CLASS_HID_40031] = 360,
+	[BNXT_ULP_CLASS_HID_40ac5] = 361,
+	[BNXT_ULP_CLASS_HID_4174d] = 362,
+	[BNXT_ULP_CLASS_HID_41081] = 363,
+	[BNXT_ULP_CLASS_HID_41d09] = 364,
+	[BNXT_ULP_CLASS_HID_440b1] = 365,
+	[BNXT_ULP_CLASS_HID_44d39] = 366,
+	[BNXT_ULP_CLASS_HID_4477d] = 367,
+	[BNXT_ULP_CLASS_HID_453e5] = 368,
+	[BNXT_ULP_CLASS_HID_6406d] = 369,
+	[BNXT_ULP_CLASS_HID_64cd5] = 370,
+	[BNXT_ULP_CLASS_HID_64629] = 371,
+	[BNXT_ULP_CLASS_HID_65291] = 372,
+	[BNXT_ULP_CLASS_HID_6198d] = 373,
+	[BNXT_ULP_CLASS_HID_62675] = 374,
+	[BNXT_ULP_CLASS_HID_62049] = 375,
+	[BNXT_ULP_CLASS_HID_62c31] = 376,
+	[BNXT_ULP_CLASS_HID_636c5] = 377,
+	[BNXT_ULP_CLASS_HID_6434d] = 378,
+	[BNXT_ULP_CLASS_HID_63c81] = 379,
+	[BNXT_ULP_CLASS_HID_64909] = 380,
+	[BNXT_ULP_CLASS_HID_61065] = 381,
+	[BNXT_ULP_CLASS_HID_61ced] = 382,
+	[BNXT_ULP_CLASS_HID_61621] = 383,
+	[BNXT_ULP_CLASS_HID_622a9] = 384,
+	[BNXT_ULP_CLASS_HID_52a6d] = 385,
+	[BNXT_ULP_CLASS_HID_536d5] = 386,
+	[BNXT_ULP_CLASS_HID_53029] = 387,
+	[BNXT_ULP_CLASS_HID_53c91] = 388,
+	[BNXT_ULP_CLASS_HID_5038d] = 389,
+	[BNXT_ULP_CLASS_HID_51075] = 390,
+	[BNXT_ULP_CLASS_HID_50a49] = 391,
+	[BNXT_ULP_CLASS_HID_51631] = 392,
+	[BNXT_ULP_CLASS_HID_520c5] = 393,
+	[BNXT_ULP_CLASS_HID_52d4d] = 394,
+	[BNXT_ULP_CLASS_HID_52681] = 395,
+	[BNXT_ULP_CLASS_HID_53309] = 396,
+	[BNXT_ULP_CLASS_HID_556b1] = 397,
+	[BNXT_ULP_CLASS_HID_506ed] = 398,
+	[BNXT_ULP_CLASS_HID_50021] = 399,
+	[BNXT_ULP_CLASS_HID_50ca9] = 400,
+	[BNXT_ULP_CLASS_HID_7566d] = 401,
+	[BNXT_ULP_CLASS_HID_70599] = 402,
+	[BNXT_ULP_CLASS_HID_75c29] = 403,
+	[BNXT_ULP_CLASS_HID_70c45] = 404,
+	[BNXT_ULP_CLASS_HID_72f8d] = 405,
+	[BNXT_ULP_CLASS_HID_73c75] = 406,
+	[BNXT_ULP_CLASS_HID_73649] = 407,
+	[BNXT_ULP_CLASS_HID_74231] = 408,
+	[BNXT_ULP_CLASS_HID_74cc5] = 409,
+	[BNXT_ULP_CLASS_HID_7594d] = 410,
+	[BNXT_ULP_CLASS_HID_75281] = 411,
+	[BNXT_ULP_CLASS_HID_7023d] = 412,
+	[BNXT_ULP_CLASS_HID_72665] = 413,
+	[BNXT_ULP_CLASS_HID_732ed] = 414,
+	[BNXT_ULP_CLASS_HID_72c21] = 415,
+	[BNXT_ULP_CLASS_HID_738a9] = 416,
+	[BNXT_ULP_CLASS_HID_244c3] = 417,
+	[BNXT_ULP_CLASS_HID_2515b] = 418,
+	[BNXT_ULP_CLASS_HID_24b1f] = 419,
+	[BNXT_ULP_CLASS_HID_25797] = 420,
+	[BNXT_ULP_CLASS_HID_22f7f] = 421,
+	[BNXT_ULP_CLASS_HID_23bf7] = 422,
+	[BNXT_ULP_CLASS_HID_235bb] = 423,
+	[BNXT_ULP_CLASS_HID_24233] = 424,
+	[BNXT_ULP_CLASS_HID_20b8b] = 425,
+	[BNXT_ULP_CLASS_HID_21803] = 426,
+	[BNXT_ULP_CLASS_HID_211c7] = 427,
+	[BNXT_ULP_CLASS_HID_21e5f] = 428,
+	[BNXT_ULP_CLASS_HID_252d3] = 429,
+	[BNXT_ULP_CLASS_HID_202bf] = 430,
+	[BNXT_ULP_CLASS_HID_2592f] = 431,
+	[BNXT_ULP_CLASS_HID_208fb] = 432,
+	[BNXT_ULP_CLASS_HID_231f3] = 433,
+	[BNXT_ULP_CLASS_HID_23e0b] = 434,
+	[BNXT_ULP_CLASS_HID_237cf] = 435,
+	[BNXT_ULP_CLASS_HID_24447] = 436,
+	[BNXT_ULP_CLASS_HID_21c2f] = 437,
+	[BNXT_ULP_CLASS_HID_228a7] = 438,
+	[BNXT_ULP_CLASS_HID_2226b] = 439,
+	[BNXT_ULP_CLASS_HID_22ee3] = 440,
+	[BNXT_ULP_CLASS_HID_25567] = 441,
+	[BNXT_ULP_CLASS_HID_20533] = 442,
+	[BNXT_ULP_CLASS_HID_25ba3] = 443,
+	[BNXT_ULP_CLASS_HID_20b0f] = 444,
+	[BNXT_ULP_CLASS_HID_23f83] = 445,
+	[BNXT_ULP_CLASS_HID_24c1b] = 446,
+	[BNXT_ULP_CLASS_HID_245df] = 447,
+	[BNXT_ULP_CLASS_HID_25257] = 448,
+	[BNXT_ULP_CLASS_HID_64017] = 449,
+	[BNXT_ULP_CLASS_HID_64caf] = 450,
+	[BNXT_ULP_CLASS_HID_64653] = 451,
+	[BNXT_ULP_CLASS_HID_652eb] = 452,
+	[BNXT_ULP_CLASS_HID_62ab3] = 453,
+	[BNXT_ULP_CLASS_HID_636cb] = 454,
+	[BNXT_ULP_CLASS_HID_6308f] = 455,
+	[BNXT_ULP_CLASS_HID_63d07] = 456,
+	[BNXT_ULP_CLASS_HID_606df] = 457,
+	[BNXT_ULP_CLASS_HID_61357] = 458,
+	[BNXT_ULP_CLASS_HID_60d1b] = 459,
+	[BNXT_ULP_CLASS_HID_61993] = 460,
+	[BNXT_ULP_CLASS_HID_64e27] = 461,
+	[BNXT_ULP_CLASS_HID_65abf] = 462,
+	[BNXT_ULP_CLASS_HID_65463] = 463,
+	[BNXT_ULP_CLASS_HID_603cf] = 464,
+	[BNXT_ULP_CLASS_HID_62cc7] = 465,
+	[BNXT_ULP_CLASS_HID_6395f] = 466,
+	[BNXT_ULP_CLASS_HID_63303] = 467,
+	[BNXT_ULP_CLASS_HID_63f9b] = 468,
+	[BNXT_ULP_CLASS_HID_61763] = 469,
+	[BNXT_ULP_CLASS_HID_623fb] = 470,
+	[BNXT_ULP_CLASS_HID_61dbf] = 471,
+	[BNXT_ULP_CLASS_HID_62a37] = 472,
+	[BNXT_ULP_CLASS_HID_650bb] = 473,
+	[BNXT_ULP_CLASS_HID_60007] = 474,
+	[BNXT_ULP_CLASS_HID_656f7] = 475,
+	[BNXT_ULP_CLASS_HID_60643] = 476,
+	[BNXT_ULP_CLASS_HID_63ad7] = 477,
+	[BNXT_ULP_CLASS_HID_6476f] = 478,
+	[BNXT_ULP_CLASS_HID_64113] = 479,
+	[BNXT_ULP_CLASS_HID_64dab] = 480,
+	[BNXT_ULP_CLASS_HID_35ac3] = 481,
+	[BNXT_ULP_CLASS_HID_30aaf] = 482,
+	[BNXT_ULP_CLASS_HID_30453] = 483,
+	[BNXT_ULP_CLASS_HID_310eb] = 484,
+	[BNXT_ULP_CLASS_HID_3457f] = 485,
+	[BNXT_ULP_CLASS_HID_351f7] = 486,
+	[BNXT_ULP_CLASS_HID_34bbb] = 487,
+	[BNXT_ULP_CLASS_HID_35833] = 488,
+	[BNXT_ULP_CLASS_HID_3218b] = 489,
+	[BNXT_ULP_CLASS_HID_32e03] = 490,
+	[BNXT_ULP_CLASS_HID_327c7] = 491,
+	[BNXT_ULP_CLASS_HID_3345f] = 492,
+	[BNXT_ULP_CLASS_HID_30c27] = 493,
+	[BNXT_ULP_CLASS_HID_318bf] = 494,
+	[BNXT_ULP_CLASS_HID_31263] = 495,
+	[BNXT_ULP_CLASS_HID_31efb] = 496,
+	[BNXT_ULP_CLASS_HID_347f3] = 497,
+	[BNXT_ULP_CLASS_HID_3540b] = 498,
+	[BNXT_ULP_CLASS_HID_34dcf] = 499,
+	[BNXT_ULP_CLASS_HID_35a47] = 500,
+	[BNXT_ULP_CLASS_HID_3322f] = 501,
+	[BNXT_ULP_CLASS_HID_33ea7] = 502,
+	[BNXT_ULP_CLASS_HID_3386b] = 503,
+	[BNXT_ULP_CLASS_HID_344e3] = 504,
+	[BNXT_ULP_CLASS_HID_30ebb] = 505,
+	[BNXT_ULP_CLASS_HID_31b33] = 506,
+	[BNXT_ULP_CLASS_HID_314f7] = 507,
+	[BNXT_ULP_CLASS_HID_3210f] = 508,
+	[BNXT_ULP_CLASS_HID_35583] = 509,
+	[BNXT_ULP_CLASS_HID_3056f] = 510,
+	[BNXT_ULP_CLASS_HID_35bdf] = 511,
+	[BNXT_ULP_CLASS_HID_30bab] = 512,
+	[BNXT_ULP_CLASS_HID_75617] = 513,
+	[BNXT_ULP_CLASS_HID_705e3] = 514,
+	[BNXT_ULP_CLASS_HID_75c53] = 515,
+	[BNXT_ULP_CLASS_HID_70c3f] = 516,
+	[BNXT_ULP_CLASS_HID_740b3] = 517,
+	[BNXT_ULP_CLASS_HID_74ccb] = 518,
+	[BNXT_ULP_CLASS_HID_7468f] = 519,
+	[BNXT_ULP_CLASS_HID_75307] = 520,
+	[BNXT_ULP_CLASS_HID_71cdf] = 521,
+	[BNXT_ULP_CLASS_HID_72957] = 522,
+	[BNXT_ULP_CLASS_HID_7231b] = 523,
+	[BNXT_ULP_CLASS_HID_72f93] = 524,
+	[BNXT_ULP_CLASS_HID_7077b] = 525,
+	[BNXT_ULP_CLASS_HID_713f3] = 526,
+	[BNXT_ULP_CLASS_HID_70db7] = 527,
+	[BNXT_ULP_CLASS_HID_719cf] = 528,
+	[BNXT_ULP_CLASS_HID_742c7] = 529,
+	[BNXT_ULP_CLASS_HID_74f5f] = 530,
+	[BNXT_ULP_CLASS_HID_74903] = 531,
+	[BNXT_ULP_CLASS_HID_7559b] = 532,
+	[BNXT_ULP_CLASS_HID_72d63] = 533,
+	[BNXT_ULP_CLASS_HID_739fb] = 534,
+	[BNXT_ULP_CLASS_HID_733bf] = 535,
+	[BNXT_ULP_CLASS_HID_74037] = 536,
+	[BNXT_ULP_CLASS_HID_7098f] = 537,
+	[BNXT_ULP_CLASS_HID_71607] = 538,
+	[BNXT_ULP_CLASS_HID_70fcb] = 539,
+	[BNXT_ULP_CLASS_HID_71c43] = 540,
+	[BNXT_ULP_CLASS_HID_750d7] = 541,
+	[BNXT_ULP_CLASS_HID_700a3] = 542,
+	[BNXT_ULP_CLASS_HID_75713] = 543,
+	[BNXT_ULP_CLASS_HID_706ff] = 544,
+	[BNXT_ULP_CLASS_HID_2cfc3] = 545,
+	[BNXT_ULP_CLASS_HID_2dc5b] = 546,
+	[BNXT_ULP_CLASS_HID_2d61f] = 547,
+	[BNXT_ULP_CLASS_HID_285eb] = 548,
+	[BNXT_ULP_CLASS_HID_2ba7f] = 549,
+	[BNXT_ULP_CLASS_HID_2c6f7] = 550,
+	[BNXT_ULP_CLASS_HID_2c0bb] = 551,
+	[BNXT_ULP_CLASS_HID_2cd33] = 552,
+	[BNXT_ULP_CLASS_HID_2968b] = 553,
+	[BNXT_ULP_CLASS_HID_2a303] = 554,
+	[BNXT_ULP_CLASS_HID_29cc7] = 555,
+	[BNXT_ULP_CLASS_HID_2a95f] = 556,
+	[BNXT_ULP_CLASS_HID_28127] = 557,
+	[BNXT_ULP_CLASS_HID_28dbf] = 558,
+	[BNXT_ULP_CLASS_HID_28763] = 559,
+	[BNXT_ULP_CLASS_HID_293fb] = 560,
+	[BNXT_ULP_CLASS_HID_2bcf3] = 561,
+	[BNXT_ULP_CLASS_HID_2c90b] = 562,
+	[BNXT_ULP_CLASS_HID_2c2cf] = 563,
+	[BNXT_ULP_CLASS_HID_2cf47] = 564,
+	[BNXT_ULP_CLASS_HID_2a72f] = 565,
+	[BNXT_ULP_CLASS_HID_2b3a7] = 566,
+	[BNXT_ULP_CLASS_HID_2ad6b] = 567,
+	[BNXT_ULP_CLASS_HID_2b9e3] = 568,
+	[BNXT_ULP_CLASS_HID_283bb] = 569,
+	[BNXT_ULP_CLASS_HID_29033] = 570,
+	[BNXT_ULP_CLASS_HID_289f7] = 571,
+	[BNXT_ULP_CLASS_HID_2960f] = 572,
+	[BNXT_ULP_CLASS_HID_2ca83] = 573,
+	[BNXT_ULP_CLASS_HID_2d71b] = 574,
+	[BNXT_ULP_CLASS_HID_2d0df] = 575,
+	[BNXT_ULP_CLASS_HID_280ab] = 576,
+	[BNXT_ULP_CLASS_HID_6cb17] = 577,
+	[BNXT_ULP_CLASS_HID_6d7af] = 578,
+	[BNXT_ULP_CLASS_HID_6d153] = 579,
+	[BNXT_ULP_CLASS_HID_6813f] = 580,
+	[BNXT_ULP_CLASS_HID_6b5b3] = 581,
+	[BNXT_ULP_CLASS_HID_6c1cb] = 582,
+	[BNXT_ULP_CLASS_HID_6bb8f] = 583,
+	[BNXT_ULP_CLASS_HID_6c807] = 584,
+	[BNXT_ULP_CLASS_HID_691df] = 585,
+	[BNXT_ULP_CLASS_HID_69e57] = 586,
+	[BNXT_ULP_CLASS_HID_6981b] = 587,
+	[BNXT_ULP_CLASS_HID_6a493] = 588,
+	[BNXT_ULP_CLASS_HID_6d927] = 589,
+	[BNXT_ULP_CLASS_HID_688f3] = 590,
+	[BNXT_ULP_CLASS_HID_682b7] = 591,
+	[BNXT_ULP_CLASS_HID_68ecf] = 592,
+	[BNXT_ULP_CLASS_HID_6b7c7] = 593,
+	[BNXT_ULP_CLASS_HID_6c45f] = 594,
+	[BNXT_ULP_CLASS_HID_6be03] = 595,
+	[BNXT_ULP_CLASS_HID_6ca9b] = 596,
+	[BNXT_ULP_CLASS_HID_6a263] = 597,
+	[BNXT_ULP_CLASS_HID_6aefb] = 598,
+	[BNXT_ULP_CLASS_HID_6a8bf] = 599,
+	[BNXT_ULP_CLASS_HID_6b537] = 600,
+	[BNXT_ULP_CLASS_HID_6dbbb] = 601,
+	[BNXT_ULP_CLASS_HID_68b07] = 602,
+	[BNXT_ULP_CLASS_HID_684cb] = 603,
+	[BNXT_ULP_CLASS_HID_69143] = 604,
+	[BNXT_ULP_CLASS_HID_6c5d7] = 605,
+	[BNXT_ULP_CLASS_HID_6d26f] = 606,
+	[BNXT_ULP_CLASS_HID_6cc13] = 607,
+	[BNXT_ULP_CLASS_HID_6d8ab] = 608,
+	[BNXT_ULP_CLASS_HID_38917] = 609,
+	[BNXT_ULP_CLASS_HID_395af] = 610,
+	[BNXT_ULP_CLASS_HID_38f53] = 611,
+	[BNXT_ULP_CLASS_HID_39beb] = 612,
+	[BNXT_ULP_CLASS_HID_3d07f] = 613,
+	[BNXT_ULP_CLASS_HID_3dcf7] = 614,
+	[BNXT_ULP_CLASS_HID_3d6bb] = 615,
+	[BNXT_ULP_CLASS_HID_38607] = 616,
+	[BNXT_ULP_CLASS_HID_3ac8b] = 617,
+	[BNXT_ULP_CLASS_HID_3b903] = 618,
+	[BNXT_ULP_CLASS_HID_3b2c7] = 619,
+	[BNXT_ULP_CLASS_HID_3bf5f] = 620,
+	[BNXT_ULP_CLASS_HID_39727] = 621,
+	[BNXT_ULP_CLASS_HID_3a3bf] = 622,
+	[BNXT_ULP_CLASS_HID_39d63] = 623,
+	[BNXT_ULP_CLASS_HID_3a9fb] = 624,
+	[BNXT_ULP_CLASS_HID_3d2f3] = 625,
+	[BNXT_ULP_CLASS_HID_3825f] = 626,
+	[BNXT_ULP_CLASS_HID_3d8cf] = 627,
+	[BNXT_ULP_CLASS_HID_3889b] = 628,
+	[BNXT_ULP_CLASS_HID_3bd2f] = 629,
+	[BNXT_ULP_CLASS_HID_3c9a7] = 630,
+	[BNXT_ULP_CLASS_HID_3c36b] = 631,
+	[BNXT_ULP_CLASS_HID_3cfe3] = 632,
+	[BNXT_ULP_CLASS_HID_399bb] = 633,
+	[BNXT_ULP_CLASS_HID_3a633] = 634,
+	[BNXT_ULP_CLASS_HID_39ff7] = 635,
+	[BNXT_ULP_CLASS_HID_3ac0f] = 636,
+	[BNXT_ULP_CLASS_HID_383d7] = 637,
+	[BNXT_ULP_CLASS_HID_3906f] = 638,
+	[BNXT_ULP_CLASS_HID_38a13] = 639,
+	[BNXT_ULP_CLASS_HID_396ab] = 640,
+	[BNXT_ULP_CLASS_HID_7846b] = 641,
+	[BNXT_ULP_CLASS_HID_790e3] = 642,
+	[BNXT_ULP_CLASS_HID_78aa7] = 643,
+	[BNXT_ULP_CLASS_HID_7973f] = 644,
+	[BNXT_ULP_CLASS_HID_7cbb3] = 645,
+	[BNXT_ULP_CLASS_HID_7d7cb] = 646,
+	[BNXT_ULP_CLASS_HID_7d18f] = 647,
+	[BNXT_ULP_CLASS_HID_7815b] = 648,
+	[BNXT_ULP_CLASS_HID_7a7df] = 649,
+	[BNXT_ULP_CLASS_HID_7b457] = 650,
+	[BNXT_ULP_CLASS_HID_7ae1b] = 651,
+	[BNXT_ULP_CLASS_HID_7ba93] = 652,
+	[BNXT_ULP_CLASS_HID_7927b] = 653,
+	[BNXT_ULP_CLASS_HID_79ef3] = 654,
+	[BNXT_ULP_CLASS_HID_798b7] = 655,
+	[BNXT_ULP_CLASS_HID_7a4cf] = 656,
+	[BNXT_ULP_CLASS_HID_7cdc7] = 657,
+	[BNXT_ULP_CLASS_HID_7da5f] = 658,
+	[BNXT_ULP_CLASS_HID_7d403] = 659,
+	[BNXT_ULP_CLASS_HID_783ef] = 660,
+	[BNXT_ULP_CLASS_HID_7b863] = 661,
+	[BNXT_ULP_CLASS_HID_7c4fb] = 662,
+	[BNXT_ULP_CLASS_HID_7bebf] = 663,
+	[BNXT_ULP_CLASS_HID_7cb37] = 664,
+	[BNXT_ULP_CLASS_HID_7948f] = 665,
+	[BNXT_ULP_CLASS_HID_7a107] = 666,
+	[BNXT_ULP_CLASS_HID_79acb] = 667,
+	[BNXT_ULP_CLASS_HID_7a743] = 668,
+	[BNXT_ULP_CLASS_HID_7dbd7] = 669,
+	[BNXT_ULP_CLASS_HID_78ba3] = 670,
+	[BNXT_ULP_CLASS_HID_78567] = 671,
+	[BNXT_ULP_CLASS_HID_791ff] = 672,
+	[BNXT_ULP_CLASS_HID_a3db] = 673,
+	[BNXT_ULP_CLASS_HID_b043] = 674,
+	[BNXT_ULP_CLASS_HID_aa07] = 675,
+	[BNXT_ULP_CLASS_HID_b68f] = 676,
+	[BNXT_ULP_CLASS_HID_8e67] = 677,
+	[BNXT_ULP_CLASS_HID_9aef] = 678,
+	[BNXT_ULP_CLASS_HID_94a3] = 679,
+	[BNXT_ULP_CLASS_HID_a12b] = 680,
+	[BNXT_ULP_CLASS_HID_c7af] = 681,
+	[BNXT_ULP_CLASS_HID_d3d7] = 682,
+	[BNXT_ULP_CLASS_HID_cdeb] = 683,
+	[BNXT_ULP_CLASS_HID_da13] = 684,
+	[BNXT_ULP_CLASS_HID_b1cb] = 685,
+	[BNXT_ULP_CLASS_HID_be73] = 686,
+	[BNXT_ULP_CLASS_HID_b837] = 687,
+	[BNXT_ULP_CLASS_HID_c4bf] = 688,
+	[BNXT_ULP_CLASS_HID_49f0f] = 689,
+	[BNXT_ULP_CLASS_HID_4abb7] = 690,
+	[BNXT_ULP_CLASS_HID_4a54b] = 691,
+	[BNXT_ULP_CLASS_HID_4b1f3] = 692,
+	[BNXT_ULP_CLASS_HID_489ab] = 693,
+	[BNXT_ULP_CLASS_HID_495d3] = 694,
+	[BNXT_ULP_CLASS_HID_48f97] = 695,
+	[BNXT_ULP_CLASS_HID_49c1f] = 696,
+	[BNXT_ULP_CLASS_HID_4c293] = 697,
+	[BNXT_ULP_CLASS_HID_4cf1b] = 698,
+	[BNXT_ULP_CLASS_HID_4c8df] = 699,
+	[BNXT_ULP_CLASS_HID_4d547] = 700,
+	[BNXT_ULP_CLASS_HID_4ad3f] = 701,
+	[BNXT_ULP_CLASS_HID_4b9a7] = 702,
+	[BNXT_ULP_CLASS_HID_4b37b] = 703,
+	[BNXT_ULP_CLASS_HID_4bfe3] = 704,
+	[BNXT_ULP_CLASS_HID_1b9db] = 705,
+	[BNXT_ULP_CLASS_HID_1c643] = 706,
+	[BNXT_ULP_CLASS_HID_1c007] = 707,
+	[BNXT_ULP_CLASS_HID_1cc8f] = 708,
+	[BNXT_ULP_CLASS_HID_1a467] = 709,
+	[BNXT_ULP_CLASS_HID_1b0ef] = 710,
+	[BNXT_ULP_CLASS_HID_1aaa3] = 711,
+	[BNXT_ULP_CLASS_HID_1b72b] = 712,
+	[BNXT_ULP_CLASS_HID_18093] = 713,
+	[BNXT_ULP_CLASS_HID_18d1b] = 714,
+	[BNXT_ULP_CLASS_HID_186df] = 715,
+	[BNXT_ULP_CLASS_HID_19347] = 716,
+	[BNXT_ULP_CLASS_HID_1c7cb] = 717,
+	[BNXT_ULP_CLASS_HID_1d473] = 718,
+	[BNXT_ULP_CLASS_HID_1ce37] = 719,
+	[BNXT_ULP_CLASS_HID_1dabf] = 720,
+	[BNXT_ULP_CLASS_HID_5b50f] = 721,
+	[BNXT_ULP_CLASS_HID_5c1b7] = 722,
+	[BNXT_ULP_CLASS_HID_5bb4b] = 723,
+	[BNXT_ULP_CLASS_HID_5c7f3] = 724,
+	[BNXT_ULP_CLASS_HID_59fab] = 725,
+	[BNXT_ULP_CLASS_HID_5abd3] = 726,
+	[BNXT_ULP_CLASS_HID_5a597] = 727,
+	[BNXT_ULP_CLASS_HID_5b21f] = 728,
+	[BNXT_ULP_CLASS_HID_5d893] = 729,
+	[BNXT_ULP_CLASS_HID_5884f] = 730,
+	[BNXT_ULP_CLASS_HID_58203] = 731,
+	[BNXT_ULP_CLASS_HID_58e8b] = 732,
+	[BNXT_ULP_CLASS_HID_5c33f] = 733,
+	[BNXT_ULP_CLASS_HID_5cfa7] = 734,
+	[BNXT_ULP_CLASS_HID_5c97b] = 735,
+	[BNXT_ULP_CLASS_HID_5d5e3] = 736,
+	[BNXT_ULP_CLASS_HID_e95b] = 737,
+	[BNXT_ULP_CLASS_HID_f5c3] = 738,
+	[BNXT_ULP_CLASS_HID_ef87] = 739,
+	[BNXT_ULP_CLASS_HID_fc0f] = 740,
+	[BNXT_ULP_CLASS_HID_d3e7] = 741,
+	[BNXT_ULP_CLASS_HID_e06f] = 742,
+	[BNXT_ULP_CLASS_HID_da23] = 743,
+	[BNXT_ULP_CLASS_HID_e6ab] = 744,
+	[BNXT_ULP_CLASS_HID_cd2f] = 745,
+	[BNXT_ULP_CLASS_HID_d957] = 746,
+	[BNXT_ULP_CLASS_HID_d36b] = 747,
+	[BNXT_ULP_CLASS_HID_c2c7] = 748,
+	[BNXT_ULP_CLASS_HID_f74b] = 749,
+	[BNXT_ULP_CLASS_HID_c3f3] = 750,
+	[BNXT_ULP_CLASS_HID_fdb7] = 751,
+	[BNXT_ULP_CLASS_HID_ca3f] = 752,
+	[BNXT_ULP_CLASS_HID_4e48f] = 753,
+	[BNXT_ULP_CLASS_HID_4f137] = 754,
+	[BNXT_ULP_CLASS_HID_4eacb] = 755,
+	[BNXT_ULP_CLASS_HID_4f773] = 756,
+	[BNXT_ULP_CLASS_HID_4cf2b] = 757,
+	[BNXT_ULP_CLASS_HID_4db53] = 758,
+	[BNXT_ULP_CLASS_HID_4d517] = 759,
+	[BNXT_ULP_CLASS_HID_4e19f] = 760,
+	[BNXT_ULP_CLASS_HID_4c813] = 761,
+	[BNXT_ULP_CLASS_HID_4d49b] = 762,
+	[BNXT_ULP_CLASS_HID_4ce5f] = 763,
+	[BNXT_ULP_CLASS_HID_4dac7] = 764,
+	[BNXT_ULP_CLASS_HID_4f2bf] = 765,
+	[BNXT_ULP_CLASS_HID_4ff27] = 766,
+	[BNXT_ULP_CLASS_HID_4f8fb] = 767,
+	[BNXT_ULP_CLASS_HID_4c563] = 768,
+	[BNXT_ULP_CLASS_HID_1ff5b] = 769,
+	[BNXT_ULP_CLASS_HID_1cbc3] = 770,
+	[BNXT_ULP_CLASS_HID_1c587] = 771,
+	[BNXT_ULP_CLASS_HID_1d20f] = 772,
+	[BNXT_ULP_CLASS_HID_1e9e7] = 773,
+	[BNXT_ULP_CLASS_HID_1f66f] = 774,
+	[BNXT_ULP_CLASS_HID_1f023] = 775,
+	[BNXT_ULP_CLASS_HID_1fcab] = 776,
+	[BNXT_ULP_CLASS_HID_1c613] = 777,
+	[BNXT_ULP_CLASS_HID_1d29b] = 778,
+	[BNXT_ULP_CLASS_HID_1cc5f] = 779,
+	[BNXT_ULP_CLASS_HID_1d8c7] = 780,
+	[BNXT_ULP_CLASS_HID_1cd4b] = 781,
+	[BNXT_ULP_CLASS_HID_1d9f3] = 782,
+	[BNXT_ULP_CLASS_HID_1d3b7] = 783,
+	[BNXT_ULP_CLASS_HID_1c363] = 784,
+	[BNXT_ULP_CLASS_HID_5fa8f] = 785,
+	[BNXT_ULP_CLASS_HID_5c737] = 786,
+	[BNXT_ULP_CLASS_HID_5c0cb] = 787,
+	[BNXT_ULP_CLASS_HID_5cd73] = 788,
+	[BNXT_ULP_CLASS_HID_5e52b] = 789,
+	[BNXT_ULP_CLASS_HID_5f153] = 790,
+	[BNXT_ULP_CLASS_HID_5eb17] = 791,
+	[BNXT_ULP_CLASS_HID_5f79f] = 792,
+	[BNXT_ULP_CLASS_HID_5c147] = 793,
+	[BNXT_ULP_CLASS_HID_5cdcf] = 794,
+	[BNXT_ULP_CLASS_HID_5c783] = 795,
+	[BNXT_ULP_CLASS_HID_5d40b] = 796,
+	[BNXT_ULP_CLASS_HID_5c8bf] = 797,
+	[BNXT_ULP_CLASS_HID_5d527] = 798,
+	[BNXT_ULP_CLASS_HID_5cefb] = 799,
+	[BNXT_ULP_CLASS_HID_5db63] = 800,
+	[BNXT_ULP_CLASS_HID_a69b] = 801,
+	[BNXT_ULP_CLASS_HID_b303] = 802,
+	[BNXT_ULP_CLASS_HID_acc7] = 803,
+	[BNXT_ULP_CLASS_HID_b94f] = 804,
+	[BNXT_ULP_CLASS_HID_b127] = 805,
+	[BNXT_ULP_CLASS_HID_bdaf] = 806,
+	[BNXT_ULP_CLASS_HID_b763] = 807,
+	[BNXT_ULP_CLASS_HID_a3eb] = 808,
+	[BNXT_ULP_CLASS_HID_ea6f] = 809,
+	[BNXT_ULP_CLASS_HID_f697] = 810,
+	[BNXT_ULP_CLASS_HID_f0ab] = 811,
+	[BNXT_ULP_CLASS_HID_a007] = 812,
+	[BNXT_ULP_CLASS_HID_b48b] = 813,
+	[BNXT_ULP_CLASS_HID_e133] = 814,
+	[BNXT_ULP_CLASS_HID_baf7] = 815,
+	[BNXT_ULP_CLASS_HID_e77f] = 816,
+	[BNXT_ULP_CLASS_HID_4a1cf] = 817,
+	[BNXT_ULP_CLASS_HID_4ae77] = 818,
+	[BNXT_ULP_CLASS_HID_4a80b] = 819,
+	[BNXT_ULP_CLASS_HID_4b4b3] = 820,
+	[BNXT_ULP_CLASS_HID_4ac6b] = 821,
+	[BNXT_ULP_CLASS_HID_4b893] = 822,
+	[BNXT_ULP_CLASS_HID_4b257] = 823,
+	[BNXT_ULP_CLASS_HID_4bedf] = 824,
+	[BNXT_ULP_CLASS_HID_4e553] = 825,
+	[BNXT_ULP_CLASS_HID_4f1db] = 826,
+	[BNXT_ULP_CLASS_HID_4eb9f] = 827,
+	[BNXT_ULP_CLASS_HID_4f807] = 828,
+	[BNXT_ULP_CLASS_HID_4afff] = 829,
+	[BNXT_ULP_CLASS_HID_4bc67] = 830,
+	[BNXT_ULP_CLASS_HID_4b63b] = 831,
+	[BNXT_ULP_CLASS_HID_4e2a3] = 832,
+	[BNXT_ULP_CLASS_HID_1bc9b] = 833,
+	[BNXT_ULP_CLASS_HID_1e903] = 834,
+	[BNXT_ULP_CLASS_HID_1e2c7] = 835,
+	[BNXT_ULP_CLASS_HID_1ef4f] = 836,
+	[BNXT_ULP_CLASS_HID_1a727] = 837,
+	[BNXT_ULP_CLASS_HID_1b3af] = 838,
+	[BNXT_ULP_CLASS_HID_1ad63] = 839,
+	[BNXT_ULP_CLASS_HID_1b9eb] = 840,
+	[BNXT_ULP_CLASS_HID_1a353] = 841,
+	[BNXT_ULP_CLASS_HID_1afdb] = 842,
+	[BNXT_ULP_CLASS_HID_1a99f] = 843,
+	[BNXT_ULP_CLASS_HID_1b607] = 844,
+	[BNXT_ULP_CLASS_HID_1ea8b] = 845,
+	[BNXT_ULP_CLASS_HID_1f733] = 846,
+	[BNXT_ULP_CLASS_HID_1f0f7] = 847,
+	[BNXT_ULP_CLASS_HID_1a0a3] = 848,
+	[BNXT_ULP_CLASS_HID_5b7cf] = 849,
+	[BNXT_ULP_CLASS_HID_5e477] = 850,
+	[BNXT_ULP_CLASS_HID_5be0b] = 851,
+	[BNXT_ULP_CLASS_HID_5eab3] = 852,
+	[BNXT_ULP_CLASS_HID_5a26b] = 853,
+	[BNXT_ULP_CLASS_HID_5ae93] = 854,
+	[BNXT_ULP_CLASS_HID_5a857] = 855,
+	[BNXT_ULP_CLASS_HID_5b4df] = 856,
+	[BNXT_ULP_CLASS_HID_5fb53] = 857,
+	[BNXT_ULP_CLASS_HID_5ab0f] = 858,
+	[BNXT_ULP_CLASS_HID_5a4c3] = 859,
+	[BNXT_ULP_CLASS_HID_5b14b] = 860,
+	[BNXT_ULP_CLASS_HID_5e5ff] = 861,
+	[BNXT_ULP_CLASS_HID_5f267] = 862,
+	[BNXT_ULP_CLASS_HID_5ec3b] = 863,
+	[BNXT_ULP_CLASS_HID_5f8a3] = 864,
+	[BNXT_ULP_CLASS_HID_ec1b] = 865,
+	[BNXT_ULP_CLASS_HID_f883] = 866,
+	[BNXT_ULP_CLASS_HID_f247] = 867,
+	[BNXT_ULP_CLASS_HID_fecf] = 868,
+	[BNXT_ULP_CLASS_HID_f6a7] = 869,
+	[BNXT_ULP_CLASS_HID_e32f] = 870,
+	[BNXT_ULP_CLASS_HID_fce3] = 871,
+	[BNXT_ULP_CLASS_HID_e96b] = 872,
+	[BNXT_ULP_CLASS_HID_efef] = 873,
+	[BNXT_ULP_CLASS_HID_fc17] = 874,
+	[BNXT_ULP_CLASS_HID_f62b] = 875,
+	[BNXT_ULP_CLASS_HID_e587] = 876,
+	[BNXT_ULP_CLASS_HID_fa0b] = 877,
+	[BNXT_ULP_CLASS_HID_e6b3] = 878,
+	[BNXT_ULP_CLASS_HID_e077] = 879,
+	[BNXT_ULP_CLASS_HID_ecff] = 880,
+	[BNXT_ULP_CLASS_HID_4e74f] = 881,
+	[BNXT_ULP_CLASS_HID_4f3f7] = 882,
+	[BNXT_ULP_CLASS_HID_4ed8b] = 883,
+	[BNXT_ULP_CLASS_HID_4fa33] = 884,
+	[BNXT_ULP_CLASS_HID_4f1eb] = 885,
+	[BNXT_ULP_CLASS_HID_4fe13] = 886,
+	[BNXT_ULP_CLASS_HID_4f7d7] = 887,
+	[BNXT_ULP_CLASS_HID_4e45f] = 888,
+	[BNXT_ULP_CLASS_HID_4ead3] = 889,
+	[BNXT_ULP_CLASS_HID_4f75b] = 890,
+	[BNXT_ULP_CLASS_HID_4f11f] = 891,
+	[BNXT_ULP_CLASS_HID_4e0cb] = 892,
+	[BNXT_ULP_CLASS_HID_4f57f] = 893,
+	[BNXT_ULP_CLASS_HID_4e1e7] = 894,
+	[BNXT_ULP_CLASS_HID_4fbbb] = 895,
+	[BNXT_ULP_CLASS_HID_4e823] = 896,
+	[BNXT_ULP_CLASS_HID_1e21b] = 897,
+	[BNXT_ULP_CLASS_HID_1ee83] = 898,
+	[BNXT_ULP_CLASS_HID_1e847] = 899,
+	[BNXT_ULP_CLASS_HID_1f4cf] = 900,
+	[BNXT_ULP_CLASS_HID_1eca7] = 901,
+	[BNXT_ULP_CLASS_HID_1f92f] = 902,
+	[BNXT_ULP_CLASS_HID_1f2e3] = 903,
+	[BNXT_ULP_CLASS_HID_1ff6b] = 904,
+	[BNXT_ULP_CLASS_HID_1e8d3] = 905,
+	[BNXT_ULP_CLASS_HID_1f55b] = 906,
+	[BNXT_ULP_CLASS_HID_1ef1f] = 907,
+	[BNXT_ULP_CLASS_HID_1fb87] = 908,
+	[BNXT_ULP_CLASS_HID_1f00b] = 909,
+	[BNXT_ULP_CLASS_HID_1fcb3] = 910,
+	[BNXT_ULP_CLASS_HID_1f677] = 911,
+	[BNXT_ULP_CLASS_HID_1e623] = 912,
+	[BNXT_ULP_CLASS_HID_5fd4f] = 913,
+	[BNXT_ULP_CLASS_HID_5e9f7] = 914,
+	[BNXT_ULP_CLASS_HID_5e38b] = 915,
+	[BNXT_ULP_CLASS_HID_5f033] = 916,
+	[BNXT_ULP_CLASS_HID_5e7eb] = 917,
+	[BNXT_ULP_CLASS_HID_5f413] = 918,
+	[BNXT_ULP_CLASS_HID_5edd7] = 919,
+	[BNXT_ULP_CLASS_HID_5fa5f] = 920,
+	[BNXT_ULP_CLASS_HID_5e407] = 921,
+	[BNXT_ULP_CLASS_HID_5f08f] = 922,
+	[BNXT_ULP_CLASS_HID_5ea43] = 923,
+	[BNXT_ULP_CLASS_HID_5f6cb] = 924,
+	[BNXT_ULP_CLASS_HID_5eb7f] = 925,
+	[BNXT_ULP_CLASS_HID_5f7e7] = 926,
+	[BNXT_ULP_CLASS_HID_5f1bb] = 927,
+	[BNXT_ULP_CLASS_HID_5e117] = 928,
+	[BNXT_ULP_CLASS_HID_244a3] = 929,
+	[BNXT_ULP_CLASS_HID_2513b] = 930,
+	[BNXT_ULP_CLASS_HID_24b7f] = 931,
+	[BNXT_ULP_CLASS_HID_257f7] = 932,
+	[BNXT_ULP_CLASS_HID_22f1f] = 933,
+	[BNXT_ULP_CLASS_HID_23b97] = 934,
+	[BNXT_ULP_CLASS_HID_235db] = 935,
+	[BNXT_ULP_CLASS_HID_24253] = 936,
+	[BNXT_ULP_CLASS_HID_20beb] = 937,
+	[BNXT_ULP_CLASS_HID_21863] = 938,
+	[BNXT_ULP_CLASS_HID_211a7] = 939,
+	[BNXT_ULP_CLASS_HID_21e3f] = 940,
+	[BNXT_ULP_CLASS_HID_252b3] = 941,
+	[BNXT_ULP_CLASS_HID_202df] = 942,
+	[BNXT_ULP_CLASS_HID_2594f] = 943,
+	[BNXT_ULP_CLASS_HID_2089b] = 944,
+	[BNXT_ULP_CLASS_HID_23193] = 945,
+	[BNXT_ULP_CLASS_HID_23e6b] = 946,
+	[BNXT_ULP_CLASS_HID_237af] = 947,
+	[BNXT_ULP_CLASS_HID_24427] = 948,
+	[BNXT_ULP_CLASS_HID_21c4f] = 949,
+	[BNXT_ULP_CLASS_HID_228c7] = 950,
+	[BNXT_ULP_CLASS_HID_2220b] = 951,
+	[BNXT_ULP_CLASS_HID_22e83] = 952,
+	[BNXT_ULP_CLASS_HID_25507] = 953,
+	[BNXT_ULP_CLASS_HID_20553] = 954,
+	[BNXT_ULP_CLASS_HID_25bc3] = 955,
+	[BNXT_ULP_CLASS_HID_20b6f] = 956,
+	[BNXT_ULP_CLASS_HID_23fe3] = 957,
+	[BNXT_ULP_CLASS_HID_24c7b] = 958,
+	[BNXT_ULP_CLASS_HID_245bf] = 959,
+	[BNXT_ULP_CLASS_HID_25237] = 960,
+	[BNXT_ULP_CLASS_HID_64077] = 961,
+	[BNXT_ULP_CLASS_HID_64ccf] = 962,
+	[BNXT_ULP_CLASS_HID_64633] = 963,
+	[BNXT_ULP_CLASS_HID_6528b] = 964,
+	[BNXT_ULP_CLASS_HID_62ad3] = 965,
+	[BNXT_ULP_CLASS_HID_636ab] = 966,
+	[BNXT_ULP_CLASS_HID_630ef] = 967,
+	[BNXT_ULP_CLASS_HID_63d67] = 968,
+	[BNXT_ULP_CLASS_HID_606bf] = 969,
+	[BNXT_ULP_CLASS_HID_61337] = 970,
+	[BNXT_ULP_CLASS_HID_60d7b] = 971,
+	[BNXT_ULP_CLASS_HID_619f3] = 972,
+	[BNXT_ULP_CLASS_HID_64e47] = 973,
+	[BNXT_ULP_CLASS_HID_65adf] = 974,
+	[BNXT_ULP_CLASS_HID_65403] = 975,
+	[BNXT_ULP_CLASS_HID_603af] = 976,
+	[BNXT_ULP_CLASS_HID_62ca7] = 977,
+	[BNXT_ULP_CLASS_HID_6393f] = 978,
+	[BNXT_ULP_CLASS_HID_63363] = 979,
+	[BNXT_ULP_CLASS_HID_63ffb] = 980,
+	[BNXT_ULP_CLASS_HID_61703] = 981,
+	[BNXT_ULP_CLASS_HID_6239b] = 982,
+	[BNXT_ULP_CLASS_HID_61ddf] = 983,
+	[BNXT_ULP_CLASS_HID_62a57] = 984,
+	[BNXT_ULP_CLASS_HID_650db] = 985,
+	[BNXT_ULP_CLASS_HID_60067] = 986,
+	[BNXT_ULP_CLASS_HID_65697] = 987,
+	[BNXT_ULP_CLASS_HID_60623] = 988,
+	[BNXT_ULP_CLASS_HID_63ab7] = 989,
+	[BNXT_ULP_CLASS_HID_6470f] = 990,
+	[BNXT_ULP_CLASS_HID_64173] = 991,
+	[BNXT_ULP_CLASS_HID_64dcb] = 992,
+	[BNXT_ULP_CLASS_HID_35aa3] = 993,
+	[BNXT_ULP_CLASS_HID_30acf] = 994,
+	[BNXT_ULP_CLASS_HID_30433] = 995,
+	[BNXT_ULP_CLASS_HID_3108b] = 996,
+	[BNXT_ULP_CLASS_HID_3451f] = 997,
+	[BNXT_ULP_CLASS_HID_35197] = 998,
+	[BNXT_ULP_CLASS_HID_34bdb] = 999,
+	[BNXT_ULP_CLASS_HID_35853] = 1000,
+	[BNXT_ULP_CLASS_HID_321eb] = 1001,
+	[BNXT_ULP_CLASS_HID_32e63] = 1002,
+	[BNXT_ULP_CLASS_HID_327a7] = 1003,
+	[BNXT_ULP_CLASS_HID_3343f] = 1004,
+	[BNXT_ULP_CLASS_HID_30c47] = 1005,
+	[BNXT_ULP_CLASS_HID_318df] = 1006,
+	[BNXT_ULP_CLASS_HID_31203] = 1007,
+	[BNXT_ULP_CLASS_HID_31e9b] = 1008,
+	[BNXT_ULP_CLASS_HID_34793] = 1009,
+	[BNXT_ULP_CLASS_HID_3546b] = 1010,
+	[BNXT_ULP_CLASS_HID_34daf] = 1011,
+	[BNXT_ULP_CLASS_HID_35a27] = 1012,
+	[BNXT_ULP_CLASS_HID_3324f] = 1013,
+	[BNXT_ULP_CLASS_HID_33ec7] = 1014,
+	[BNXT_ULP_CLASS_HID_3380b] = 1015,
+	[BNXT_ULP_CLASS_HID_34483] = 1016,
+	[BNXT_ULP_CLASS_HID_30edb] = 1017,
+	[BNXT_ULP_CLASS_HID_31b53] = 1018,
+	[BNXT_ULP_CLASS_HID_31497] = 1019,
+	[BNXT_ULP_CLASS_HID_3216f] = 1020,
+	[BNXT_ULP_CLASS_HID_355e3] = 1021,
+	[BNXT_ULP_CLASS_HID_3050f] = 1022,
+	[BNXT_ULP_CLASS_HID_35bbf] = 1023,
+	[BNXT_ULP_CLASS_HID_30bcb] = 1024,
+	[BNXT_ULP_CLASS_HID_75677] = 1025,
+	[BNXT_ULP_CLASS_HID_70583] = 1026,
+	[BNXT_ULP_CLASS_HID_75c33] = 1027,
+	[BNXT_ULP_CLASS_HID_70c5f] = 1028,
+	[BNXT_ULP_CLASS_HID_740d3] = 1029,
+	[BNXT_ULP_CLASS_HID_74cab] = 1030,
+	[BNXT_ULP_CLASS_HID_746ef] = 1031,
+	[BNXT_ULP_CLASS_HID_75367] = 1032,
+	[BNXT_ULP_CLASS_HID_71cbf] = 1033,
+	[BNXT_ULP_CLASS_HID_72937] = 1034,
+	[BNXT_ULP_CLASS_HID_7237b] = 1035,
+	[BNXT_ULP_CLASS_HID_72ff3] = 1036,
+	[BNXT_ULP_CLASS_HID_7071b] = 1037,
+	[BNXT_ULP_CLASS_HID_71393] = 1038,
+	[BNXT_ULP_CLASS_HID_70dd7] = 1039,
+	[BNXT_ULP_CLASS_HID_719af] = 1040,
+	[BNXT_ULP_CLASS_HID_742a7] = 1041,
+	[BNXT_ULP_CLASS_HID_74f3f] = 1042,
+	[BNXT_ULP_CLASS_HID_74963] = 1043,
+	[BNXT_ULP_CLASS_HID_755fb] = 1044,
+	[BNXT_ULP_CLASS_HID_72d03] = 1045,
+	[BNXT_ULP_CLASS_HID_7399b] = 1046,
+	[BNXT_ULP_CLASS_HID_733df] = 1047,
+	[BNXT_ULP_CLASS_HID_74057] = 1048,
+	[BNXT_ULP_CLASS_HID_709ef] = 1049,
+	[BNXT_ULP_CLASS_HID_71667] = 1050,
+	[BNXT_ULP_CLASS_HID_70fab] = 1051,
+	[BNXT_ULP_CLASS_HID_71c23] = 1052,
+	[BNXT_ULP_CLASS_HID_750b7] = 1053,
+	[BNXT_ULP_CLASS_HID_700c3] = 1054,
+	[BNXT_ULP_CLASS_HID_75773] = 1055,
+	[BNXT_ULP_CLASS_HID_7069f] = 1056,
+	[BNXT_ULP_CLASS_HID_2cfa3] = 1057,
+	[BNXT_ULP_CLASS_HID_2dc3b] = 1058,
+	[BNXT_ULP_CLASS_HID_2d67f] = 1059,
+	[BNXT_ULP_CLASS_HID_2858b] = 1060,
+	[BNXT_ULP_CLASS_HID_2ba1f] = 1061,
+	[BNXT_ULP_CLASS_HID_2c697] = 1062,
+	[BNXT_ULP_CLASS_HID_2c0db] = 1063,
+	[BNXT_ULP_CLASS_HID_2cd53] = 1064,
+	[BNXT_ULP_CLASS_HID_296eb] = 1065,
+	[BNXT_ULP_CLASS_HID_2a363] = 1066,
+	[BNXT_ULP_CLASS_HID_29ca7] = 1067,
+	[BNXT_ULP_CLASS_HID_2a93f] = 1068,
+	[BNXT_ULP_CLASS_HID_28147] = 1069,
+	[BNXT_ULP_CLASS_HID_28ddf] = 1070,
+	[BNXT_ULP_CLASS_HID_28703] = 1071,
+	[BNXT_ULP_CLASS_HID_2939b] = 1072,
+	[BNXT_ULP_CLASS_HID_2bc93] = 1073,
+	[BNXT_ULP_CLASS_HID_2c96b] = 1074,
+	[BNXT_ULP_CLASS_HID_2c2af] = 1075,
+	[BNXT_ULP_CLASS_HID_2cf27] = 1076,
+	[BNXT_ULP_CLASS_HID_2a74f] = 1077,
+	[BNXT_ULP_CLASS_HID_2b3c7] = 1078,
+	[BNXT_ULP_CLASS_HID_2ad0b] = 1079,
+	[BNXT_ULP_CLASS_HID_2b983] = 1080,
+	[BNXT_ULP_CLASS_HID_283db] = 1081,
+	[BNXT_ULP_CLASS_HID_29053] = 1082,
+	[BNXT_ULP_CLASS_HID_28997] = 1083,
+	[BNXT_ULP_CLASS_HID_2966f] = 1084,
+	[BNXT_ULP_CLASS_HID_2cae3] = 1085,
+	[BNXT_ULP_CLASS_HID_2d77b] = 1086,
+	[BNXT_ULP_CLASS_HID_2d0bf] = 1087,
+	[BNXT_ULP_CLASS_HID_280cb] = 1088,
+	[BNXT_ULP_CLASS_HID_6cb77] = 1089,
+	[BNXT_ULP_CLASS_HID_6d7cf] = 1090,
+	[BNXT_ULP_CLASS_HID_6d133] = 1091,
+	[BNXT_ULP_CLASS_HID_6815f] = 1092,
+	[BNXT_ULP_CLASS_HID_6b5d3] = 1093,
+	[BNXT_ULP_CLASS_HID_6c1ab] = 1094,
+	[BNXT_ULP_CLASS_HID_6bbef] = 1095,
+	[BNXT_ULP_CLASS_HID_6c867] = 1096,
+	[BNXT_ULP_CLASS_HID_691bf] = 1097,
+	[BNXT_ULP_CLASS_HID_69e37] = 1098,
+	[BNXT_ULP_CLASS_HID_6987b] = 1099,
+	[BNXT_ULP_CLASS_HID_6a4f3] = 1100,
+	[BNXT_ULP_CLASS_HID_6d947] = 1101,
+	[BNXT_ULP_CLASS_HID_68893] = 1102,
+	[BNXT_ULP_CLASS_HID_682d7] = 1103,
+	[BNXT_ULP_CLASS_HID_68eaf] = 1104,
+	[BNXT_ULP_CLASS_HID_6b7a7] = 1105,
+	[BNXT_ULP_CLASS_HID_6c43f] = 1106,
+	[BNXT_ULP_CLASS_HID_6be63] = 1107,
+	[BNXT_ULP_CLASS_HID_6cafb] = 1108,
+	[BNXT_ULP_CLASS_HID_6a203] = 1109,
+	[BNXT_ULP_CLASS_HID_6ae9b] = 1110,
+	[BNXT_ULP_CLASS_HID_6a8df] = 1111,
+	[BNXT_ULP_CLASS_HID_6b557] = 1112,
+	[BNXT_ULP_CLASS_HID_6dbdb] = 1113,
+	[BNXT_ULP_CLASS_HID_68b67] = 1114,
+	[BNXT_ULP_CLASS_HID_684ab] = 1115,
+	[BNXT_ULP_CLASS_HID_69123] = 1116,
+	[BNXT_ULP_CLASS_HID_6c5b7] = 1117,
+	[BNXT_ULP_CLASS_HID_6d20f] = 1118,
+	[BNXT_ULP_CLASS_HID_6cc73] = 1119,
+	[BNXT_ULP_CLASS_HID_6d8cb] = 1120,
+	[BNXT_ULP_CLASS_HID_38977] = 1121,
+	[BNXT_ULP_CLASS_HID_395cf] = 1122,
+	[BNXT_ULP_CLASS_HID_38f33] = 1123,
+	[BNXT_ULP_CLASS_HID_39b8b] = 1124,
+	[BNXT_ULP_CLASS_HID_3d01f] = 1125,
+	[BNXT_ULP_CLASS_HID_3dc97] = 1126,
+	[BNXT_ULP_CLASS_HID_3d6db] = 1127,
+	[BNXT_ULP_CLASS_HID_38667] = 1128,
+	[BNXT_ULP_CLASS_HID_3aceb] = 1129,
+	[BNXT_ULP_CLASS_HID_3b963] = 1130,
+	[BNXT_ULP_CLASS_HID_3b2a7] = 1131,
+	[BNXT_ULP_CLASS_HID_3bf3f] = 1132,
+	[BNXT_ULP_CLASS_HID_39747] = 1133,
+	[BNXT_ULP_CLASS_HID_3a3df] = 1134,
+	[BNXT_ULP_CLASS_HID_39d03] = 1135,
+	[BNXT_ULP_CLASS_HID_3a99b] = 1136,
+	[BNXT_ULP_CLASS_HID_3d293] = 1137,
+	[BNXT_ULP_CLASS_HID_3823f] = 1138,
+	[BNXT_ULP_CLASS_HID_3d8af] = 1139,
+	[BNXT_ULP_CLASS_HID_388fb] = 1140,
+	[BNXT_ULP_CLASS_HID_3bd4f] = 1141,
+	[BNXT_ULP_CLASS_HID_3c9c7] = 1142,
+	[BNXT_ULP_CLASS_HID_3c30b] = 1143,
+	[BNXT_ULP_CLASS_HID_3cf83] = 1144,
+	[BNXT_ULP_CLASS_HID_399db] = 1145,
+	[BNXT_ULP_CLASS_HID_3a653] = 1146,
+	[BNXT_ULP_CLASS_HID_39f97] = 1147,
+	[BNXT_ULP_CLASS_HID_3ac6f] = 1148,
+	[BNXT_ULP_CLASS_HID_383b7] = 1149,
+	[BNXT_ULP_CLASS_HID_3900f] = 1150,
+	[BNXT_ULP_CLASS_HID_38a73] = 1151,
+	[BNXT_ULP_CLASS_HID_396cb] = 1152,
+	[BNXT_ULP_CLASS_HID_7840b] = 1153,
+	[BNXT_ULP_CLASS_HID_79083] = 1154,
+	[BNXT_ULP_CLASS_HID_78ac7] = 1155,
+	[BNXT_ULP_CLASS_HID_7975f] = 1156,
+	[BNXT_ULP_CLASS_HID_7cbd3] = 1157,
+	[BNXT_ULP_CLASS_HID_7d7ab] = 1158,
+	[BNXT_ULP_CLASS_HID_7d1ef] = 1159,
+	[BNXT_ULP_CLASS_HID_7813b] = 1160,
+	[BNXT_ULP_CLASS_HID_7a7bf] = 1161,
+	[BNXT_ULP_CLASS_HID_7b437] = 1162,
+	[BNXT_ULP_CLASS_HID_7ae7b] = 1163,
+	[BNXT_ULP_CLASS_HID_7baf3] = 1164,
+	[BNXT_ULP_CLASS_HID_7921b] = 1165,
+	[BNXT_ULP_CLASS_HID_79e93] = 1166,
+	[BNXT_ULP_CLASS_HID_798d7] = 1167,
+	[BNXT_ULP_CLASS_HID_7a4af] = 1168,
+	[BNXT_ULP_CLASS_HID_7cda7] = 1169,
+	[BNXT_ULP_CLASS_HID_7da3f] = 1170,
+	[BNXT_ULP_CLASS_HID_7d463] = 1171,
+	[BNXT_ULP_CLASS_HID_7838f] = 1172,
+	[BNXT_ULP_CLASS_HID_7b803] = 1173,
+	[BNXT_ULP_CLASS_HID_7c49b] = 1174,
+	[BNXT_ULP_CLASS_HID_7bedf] = 1175,
+	[BNXT_ULP_CLASS_HID_7cb57] = 1176,
+	[BNXT_ULP_CLASS_HID_794ef] = 1177,
+	[BNXT_ULP_CLASS_HID_7a167] = 1178,
+	[BNXT_ULP_CLASS_HID_79aab] = 1179,
+	[BNXT_ULP_CLASS_HID_7a723] = 1180,
+	[BNXT_ULP_CLASS_HID_7dbb7] = 1181,
+	[BNXT_ULP_CLASS_HID_78bc3] = 1182,
+	[BNXT_ULP_CLASS_HID_78507] = 1183,
+	[BNXT_ULP_CLASS_HID_7919f] = 1184,
+	[BNXT_ULP_CLASS_HID_a3bb] = 1185,
+	[BNXT_ULP_CLASS_HID_b023] = 1186,
+	[BNXT_ULP_CLASS_HID_aa67] = 1187,
+	[BNXT_ULP_CLASS_HID_b6ef] = 1188,
+	[BNXT_ULP_CLASS_HID_8e07] = 1189,
+	[BNXT_ULP_CLASS_HID_9a8f] = 1190,
+	[BNXT_ULP_CLASS_HID_94c3] = 1191,
+	[BNXT_ULP_CLASS_HID_a14b] = 1192,
+	[BNXT_ULP_CLASS_HID_c7cf] = 1193,
+	[BNXT_ULP_CLASS_HID_d3b7] = 1194,
+	[BNXT_ULP_CLASS_HID_cd8b] = 1195,
+	[BNXT_ULP_CLASS_HID_da73] = 1196,
+	[BNXT_ULP_CLASS_HID_b1ab] = 1197,
+	[BNXT_ULP_CLASS_HID_be13] = 1198,
+	[BNXT_ULP_CLASS_HID_b857] = 1199,
+	[BNXT_ULP_CLASS_HID_c4df] = 1200,
+	[BNXT_ULP_CLASS_HID_49f6f] = 1201,
+	[BNXT_ULP_CLASS_HID_4abd7] = 1202,
+	[BNXT_ULP_CLASS_HID_4a52b] = 1203,
+	[BNXT_ULP_CLASS_HID_4b193] = 1204,
+	[BNXT_ULP_CLASS_HID_489cb] = 1205,
+	[BNXT_ULP_CLASS_HID_495b3] = 1206,
+	[BNXT_ULP_CLASS_HID_48ff7] = 1207,
+	[BNXT_ULP_CLASS_HID_49c7f] = 1208,
+	[BNXT_ULP_CLASS_HID_4c2f3] = 1209,
+	[BNXT_ULP_CLASS_HID_4cf7b] = 1210,
+	[BNXT_ULP_CLASS_HID_4c8bf] = 1211,
+	[BNXT_ULP_CLASS_HID_4d527] = 1212,
+	[BNXT_ULP_CLASS_HID_4ad5f] = 1213,
+	[BNXT_ULP_CLASS_HID_4b9c7] = 1214,
+	[BNXT_ULP_CLASS_HID_4b31b] = 1215,
+	[BNXT_ULP_CLASS_HID_4bf83] = 1216,
+	[BNXT_ULP_CLASS_HID_1b9bb] = 1217,
+	[BNXT_ULP_CLASS_HID_1c623] = 1218,
+	[BNXT_ULP_CLASS_HID_1c067] = 1219,
+	[BNXT_ULP_CLASS_HID_1ccef] = 1220,
+	[BNXT_ULP_CLASS_HID_1a407] = 1221,
+	[BNXT_ULP_CLASS_HID_1b08f] = 1222,
+	[BNXT_ULP_CLASS_HID_1aac3] = 1223,
+	[BNXT_ULP_CLASS_HID_1b74b] = 1224,
+	[BNXT_ULP_CLASS_HID_180f3] = 1225,
+	[BNXT_ULP_CLASS_HID_18d7b] = 1226,
+	[BNXT_ULP_CLASS_HID_186bf] = 1227,
+	[BNXT_ULP_CLASS_HID_19327] = 1228,
+	[BNXT_ULP_CLASS_HID_1c7ab] = 1229,
+	[BNXT_ULP_CLASS_HID_1d413] = 1230,
+	[BNXT_ULP_CLASS_HID_1ce57] = 1231,
+	[BNXT_ULP_CLASS_HID_1dadf] = 1232,
+	[BNXT_ULP_CLASS_HID_5b56f] = 1233,
+	[BNXT_ULP_CLASS_HID_5c1d7] = 1234,
+	[BNXT_ULP_CLASS_HID_5bb2b] = 1235,
+	[BNXT_ULP_CLASS_HID_5c793] = 1236,
+	[BNXT_ULP_CLASS_HID_59fcb] = 1237,
+	[BNXT_ULP_CLASS_HID_5abb3] = 1238,
+	[BNXT_ULP_CLASS_HID_5a5f7] = 1239,
+	[BNXT_ULP_CLASS_HID_5b27f] = 1240,
+	[BNXT_ULP_CLASS_HID_5d8f3] = 1241,
+	[BNXT_ULP_CLASS_HID_5882f] = 1242,
+	[BNXT_ULP_CLASS_HID_58263] = 1243,
+	[BNXT_ULP_CLASS_HID_58eeb] = 1244,
+	[BNXT_ULP_CLASS_HID_5c35f] = 1245,
+	[BNXT_ULP_CLASS_HID_5cfc7] = 1246,
+	[BNXT_ULP_CLASS_HID_5c91b] = 1247,
+	[BNXT_ULP_CLASS_HID_5d583] = 1248,
+	[BNXT_ULP_CLASS_HID_e93b] = 1249,
+	[BNXT_ULP_CLASS_HID_f5a3] = 1250,
+	[BNXT_ULP_CLASS_HID_efe7] = 1251,
+	[BNXT_ULP_CLASS_HID_fc6f] = 1252,
+	[BNXT_ULP_CLASS_HID_d387] = 1253,
+	[BNXT_ULP_CLASS_HID_e00f] = 1254,
+	[BNXT_ULP_CLASS_HID_da43] = 1255,
+	[BNXT_ULP_CLASS_HID_e6cb] = 1256,
+	[BNXT_ULP_CLASS_HID_cd4f] = 1257,
+	[BNXT_ULP_CLASS_HID_d937] = 1258,
+	[BNXT_ULP_CLASS_HID_d30b] = 1259,
+	[BNXT_ULP_CLASS_HID_c2a7] = 1260,
+	[BNXT_ULP_CLASS_HID_f72b] = 1261,
+	[BNXT_ULP_CLASS_HID_c393] = 1262,
+	[BNXT_ULP_CLASS_HID_fdd7] = 1263,
+	[BNXT_ULP_CLASS_HID_ca5f] = 1264,
+	[BNXT_ULP_CLASS_HID_4e4ef] = 1265,
+	[BNXT_ULP_CLASS_HID_4f157] = 1266,
+	[BNXT_ULP_CLASS_HID_4eaab] = 1267,
+	[BNXT_ULP_CLASS_HID_4f713] = 1268,
+	[BNXT_ULP_CLASS_HID_4cf4b] = 1269,
+	[BNXT_ULP_CLASS_HID_4db33] = 1270,
+	[BNXT_ULP_CLASS_HID_4d577] = 1271,
+	[BNXT_ULP_CLASS_HID_4e1ff] = 1272,
+	[BNXT_ULP_CLASS_HID_4c873] = 1273,
+	[BNXT_ULP_CLASS_HID_4d4fb] = 1274,
+	[BNXT_ULP_CLASS_HID_4ce3f] = 1275,
+	[BNXT_ULP_CLASS_HID_4daa7] = 1276,
+	[BNXT_ULP_CLASS_HID_4f2df] = 1277,
+	[BNXT_ULP_CLASS_HID_4ff47] = 1278,
+	[BNXT_ULP_CLASS_HID_4f89b] = 1279,
+	[BNXT_ULP_CLASS_HID_4c503] = 1280,
+	[BNXT_ULP_CLASS_HID_1ff3b] = 1281,
+	[BNXT_ULP_CLASS_HID_1cba3] = 1282,
+	[BNXT_ULP_CLASS_HID_1c5e7] = 1283,
+	[BNXT_ULP_CLASS_HID_1d26f] = 1284,
+	[BNXT_ULP_CLASS_HID_1e987] = 1285,
+	[BNXT_ULP_CLASS_HID_1f60f] = 1286,
+	[BNXT_ULP_CLASS_HID_1f043] = 1287,
+	[BNXT_ULP_CLASS_HID_1fccb] = 1288,
+	[BNXT_ULP_CLASS_HID_1c673] = 1289,
+	[BNXT_ULP_CLASS_HID_1d2fb] = 1290,
+	[BNXT_ULP_CLASS_HID_1cc3f] = 1291,
+	[BNXT_ULP_CLASS_HID_1d8a7] = 1292,
+	[BNXT_ULP_CLASS_HID_1cd2b] = 1293,
+	[BNXT_ULP_CLASS_HID_1d993] = 1294,
+	[BNXT_ULP_CLASS_HID_1d3d7] = 1295,
+	[BNXT_ULP_CLASS_HID_1c303] = 1296,
+	[BNXT_ULP_CLASS_HID_5faef] = 1297,
+	[BNXT_ULP_CLASS_HID_5c757] = 1298,
+	[BNXT_ULP_CLASS_HID_5c0ab] = 1299,
+	[BNXT_ULP_CLASS_HID_5cd13] = 1300,
+	[BNXT_ULP_CLASS_HID_5e54b] = 1301,
+	[BNXT_ULP_CLASS_HID_5f133] = 1302,
+	[BNXT_ULP_CLASS_HID_5eb77] = 1303,
+	[BNXT_ULP_CLASS_HID_5f7ff] = 1304,
+	[BNXT_ULP_CLASS_HID_5c127] = 1305,
+	[BNXT_ULP_CLASS_HID_5cdaf] = 1306,
+	[BNXT_ULP_CLASS_HID_5c7e3] = 1307,
+	[BNXT_ULP_CLASS_HID_5d46b] = 1308,
+	[BNXT_ULP_CLASS_HID_5c8df] = 1309,
+	[BNXT_ULP_CLASS_HID_5d547] = 1310,
+	[BNXT_ULP_CLASS_HID_5ce9b] = 1311,
+	[BNXT_ULP_CLASS_HID_5db03] = 1312,
+	[BNXT_ULP_CLASS_HID_a6fb] = 1313,
+	[BNXT_ULP_CLASS_HID_b363] = 1314,
+	[BNXT_ULP_CLASS_HID_aca7] = 1315,
+	[BNXT_ULP_CLASS_HID_b92f] = 1316,
+	[BNXT_ULP_CLASS_HID_b147] = 1317,
+	[BNXT_ULP_CLASS_HID_bdcf] = 1318,
+	[BNXT_ULP_CLASS_HID_b703] = 1319,
+	[BNXT_ULP_CLASS_HID_a38b] = 1320,
+	[BNXT_ULP_CLASS_HID_ea0f] = 1321,
+	[BNXT_ULP_CLASS_HID_f6f7] = 1322,
+	[BNXT_ULP_CLASS_HID_f0cb] = 1323,
+	[BNXT_ULP_CLASS_HID_a067] = 1324,
+	[BNXT_ULP_CLASS_HID_b4eb] = 1325,
+	[BNXT_ULP_CLASS_HID_e153] = 1326,
+	[BNXT_ULP_CLASS_HID_ba97] = 1327,
+	[BNXT_ULP_CLASS_HID_e71f] = 1328,
+	[BNXT_ULP_CLASS_HID_4a1af] = 1329,
+	[BNXT_ULP_CLASS_HID_4ae17] = 1330,
+	[BNXT_ULP_CLASS_HID_4a86b] = 1331,
+	[BNXT_ULP_CLASS_HID_4b4d3] = 1332,
+	[BNXT_ULP_CLASS_HID_4ac0b] = 1333,
+	[BNXT_ULP_CLASS_HID_4b8f3] = 1334,
+	[BNXT_ULP_CLASS_HID_4b237] = 1335,
+	[BNXT_ULP_CLASS_HID_4bebf] = 1336,
+	[BNXT_ULP_CLASS_HID_4e533] = 1337,
+	[BNXT_ULP_CLASS_HID_4f1bb] = 1338,
+	[BNXT_ULP_CLASS_HID_4ebff] = 1339,
+	[BNXT_ULP_CLASS_HID_4f867] = 1340,
+	[BNXT_ULP_CLASS_HID_4af9f] = 1341,
+	[BNXT_ULP_CLASS_HID_4bc07] = 1342,
+	[BNXT_ULP_CLASS_HID_4b65b] = 1343,
+	[BNXT_ULP_CLASS_HID_4e2c3] = 1344,
+	[BNXT_ULP_CLASS_HID_1bcfb] = 1345,
+	[BNXT_ULP_CLASS_HID_1e963] = 1346,
+	[BNXT_ULP_CLASS_HID_1e2a7] = 1347,
+	[BNXT_ULP_CLASS_HID_1ef2f] = 1348,
+	[BNXT_ULP_CLASS_HID_1a747] = 1349,
+	[BNXT_ULP_CLASS_HID_1b3cf] = 1350,
+	[BNXT_ULP_CLASS_HID_1ad03] = 1351,
+	[BNXT_ULP_CLASS_HID_1b98b] = 1352,
+	[BNXT_ULP_CLASS_HID_1a333] = 1353,
+	[BNXT_ULP_CLASS_HID_1afbb] = 1354,
+	[BNXT_ULP_CLASS_HID_1a9ff] = 1355,
+	[BNXT_ULP_CLASS_HID_1b667] = 1356,
+	[BNXT_ULP_CLASS_HID_1eaeb] = 1357,
+	[BNXT_ULP_CLASS_HID_1f753] = 1358,
+	[BNXT_ULP_CLASS_HID_1f097] = 1359,
+	[BNXT_ULP_CLASS_HID_1a0c3] = 1360,
+	[BNXT_ULP_CLASS_HID_5b7af] = 1361,
+	[BNXT_ULP_CLASS_HID_5e417] = 1362,
+	[BNXT_ULP_CLASS_HID_5be6b] = 1363,
+	[BNXT_ULP_CLASS_HID_5ead3] = 1364,
+	[BNXT_ULP_CLASS_HID_5a20b] = 1365,
+	[BNXT_ULP_CLASS_HID_5aef3] = 1366,
+	[BNXT_ULP_CLASS_HID_5a837] = 1367,
+	[BNXT_ULP_CLASS_HID_5b4bf] = 1368,
+	[BNXT_ULP_CLASS_HID_5fb33] = 1369,
+	[BNXT_ULP_CLASS_HID_5ab6f] = 1370,
+	[BNXT_ULP_CLASS_HID_5a4a3] = 1371,
+	[BNXT_ULP_CLASS_HID_5b12b] = 1372,
+	[BNXT_ULP_CLASS_HID_5e59f] = 1373,
+	[BNXT_ULP_CLASS_HID_5f207] = 1374,
+	[BNXT_ULP_CLASS_HID_5ec5b] = 1375,
+	[BNXT_ULP_CLASS_HID_5f8c3] = 1376,
+	[BNXT_ULP_CLASS_HID_ec7b] = 1377,
+	[BNXT_ULP_CLASS_HID_f8e3] = 1378,
+	[BNXT_ULP_CLASS_HID_f227] = 1379,
+	[BNXT_ULP_CLASS_HID_feaf] = 1380,
+	[BNXT_ULP_CLASS_HID_f6c7] = 1381,
+	[BNXT_ULP_CLASS_HID_e34f] = 1382,
+	[BNXT_ULP_CLASS_HID_fc83] = 1383,
+	[BNXT_ULP_CLASS_HID_e90b] = 1384,
+	[BNXT_ULP_CLASS_HID_ef8f] = 1385,
+	[BNXT_ULP_CLASS_HID_fc77] = 1386,
+	[BNXT_ULP_CLASS_HID_f64b] = 1387,
+	[BNXT_ULP_CLASS_HID_e5e7] = 1388,
+	[BNXT_ULP_CLASS_HID_fa6b] = 1389,
+	[BNXT_ULP_CLASS_HID_e6d3] = 1390,
+	[BNXT_ULP_CLASS_HID_e017] = 1391,
+	[BNXT_ULP_CLASS_HID_ec9f] = 1392,
+	[BNXT_ULP_CLASS_HID_4e72f] = 1393,
+	[BNXT_ULP_CLASS_HID_4f397] = 1394,
+	[BNXT_ULP_CLASS_HID_4edeb] = 1395,
+	[BNXT_ULP_CLASS_HID_4fa53] = 1396,
+	[BNXT_ULP_CLASS_HID_4f18b] = 1397,
+	[BNXT_ULP_CLASS_HID_4fe73] = 1398,
+	[BNXT_ULP_CLASS_HID_4f7b7] = 1399,
+	[BNXT_ULP_CLASS_HID_4e43f] = 1400,
+	[BNXT_ULP_CLASS_HID_4eab3] = 1401,
+	[BNXT_ULP_CLASS_HID_4f73b] = 1402,
+	[BNXT_ULP_CLASS_HID_4f17f] = 1403,
+	[BNXT_ULP_CLASS_HID_4e0ab] = 1404,
+	[BNXT_ULP_CLASS_HID_4f51f] = 1405,
+	[BNXT_ULP_CLASS_HID_4e187] = 1406,
+	[BNXT_ULP_CLASS_HID_4fbdb] = 1407,
+	[BNXT_ULP_CLASS_HID_4e843] = 1408,
+	[BNXT_ULP_CLASS_HID_1e27b] = 1409,
+	[BNXT_ULP_CLASS_HID_1eee3] = 1410,
+	[BNXT_ULP_CLASS_HID_1e827] = 1411,
+	[BNXT_ULP_CLASS_HID_1f4af] = 1412,
+	[BNXT_ULP_CLASS_HID_1ecc7] = 1413,
+	[BNXT_ULP_CLASS_HID_1f94f] = 1414,
+	[BNXT_ULP_CLASS_HID_1f283] = 1415,
+	[BNXT_ULP_CLASS_HID_1ff0b] = 1416,
+	[BNXT_ULP_CLASS_HID_1e8b3] = 1417,
+	[BNXT_ULP_CLASS_HID_1f53b] = 1418,
+	[BNXT_ULP_CLASS_HID_1ef7f] = 1419,
+	[BNXT_ULP_CLASS_HID_1fbe7] = 1420,
+	[BNXT_ULP_CLASS_HID_1f06b] = 1421,
+	[BNXT_ULP_CLASS_HID_1fcd3] = 1422,
+	[BNXT_ULP_CLASS_HID_1f617] = 1423,
+	[BNXT_ULP_CLASS_HID_1e643] = 1424,
+	[BNXT_ULP_CLASS_HID_5fd2f] = 1425,
+	[BNXT_ULP_CLASS_HID_5e997] = 1426,
+	[BNXT_ULP_CLASS_HID_5e3eb] = 1427,
+	[BNXT_ULP_CLASS_HID_5f053] = 1428,
+	[BNXT_ULP_CLASS_HID_5e78b] = 1429,
+	[BNXT_ULP_CLASS_HID_5f473] = 1430,
+	[BNXT_ULP_CLASS_HID_5edb7] = 1431,
+	[BNXT_ULP_CLASS_HID_5fa3f] = 1432,
+	[BNXT_ULP_CLASS_HID_5e467] = 1433,
+	[BNXT_ULP_CLASS_HID_5f0ef] = 1434,
+	[BNXT_ULP_CLASS_HID_5ea23] = 1435,
+	[BNXT_ULP_CLASS_HID_5f6ab] = 1436,
+	[BNXT_ULP_CLASS_HID_5eb1f] = 1437,
+	[BNXT_ULP_CLASS_HID_5f787] = 1438,
+	[BNXT_ULP_CLASS_HID_5f1db] = 1439,
+	[BNXT_ULP_CLASS_HID_5e177] = 1440,
+	[BNXT_ULP_CLASS_HID_498d] = 1441,
+	[BNXT_ULP_CLASS_HID_4fc9] = 1442,
+	[BNXT_ULP_CLASS_HID_0cf9] = 1443,
+	[BNXT_ULP_CLASS_HID_1335] = 1444,
+	[BNXT_ULP_CLASS_HID_232d] = 1445,
+	[BNXT_ULP_CLASS_HID_2969] = 1446,
+	[BNXT_ULP_CLASS_HID_4345] = 1447,
+	[BNXT_ULP_CLASS_HID_4981] = 1448,
+	[BNXT_ULP_CLASS_HID_45809] = 1449,
+	[BNXT_ULP_CLASS_HID_40179] = 1450,
+	[BNXT_ULP_CLASS_HID_431a9] = 1451,
+	[BNXT_ULP_CLASS_HID_437d5] = 1452,
+	[BNXT_ULP_CLASS_HID_44e61] = 1453,
+	[BNXT_ULP_CLASS_HID_454ad] = 1454,
+	[BNXT_ULP_CLASS_HID_42801] = 1455,
+	[BNXT_ULP_CLASS_HID_42e4d] = 1456,
+	[BNXT_ULP_CLASS_HID_22c13] = 1457,
+	[BNXT_ULP_CLASS_HID_2322f] = 1458,
+	[BNXT_ULP_CLASS_HID_2164f] = 1459,
+	[BNXT_ULP_CLASS_HID_21c8b] = 1460,
+	[BNXT_ULP_CLASS_HID_24f87] = 1461,
+	[BNXT_ULP_CLASS_HID_255c3] = 1462,
+	[BNXT_ULP_CLASS_HID_239e3] = 1463,
+	[BNXT_ULP_CLASS_HID_2403f] = 1464,
+	[BNXT_ULP_CLASS_HID_218c3] = 1465,
+	[BNXT_ULP_CLASS_HID_21f1f] = 1466,
+	[BNXT_ULP_CLASS_HID_2033f] = 1467,
+	[BNXT_ULP_CLASS_HID_2097b] = 1468,
+	[BNXT_ULP_CLASS_HID_23c77] = 1469,
+	[BNXT_ULP_CLASS_HID_242b3] = 1470,
+	[BNXT_ULP_CLASS_HID_226d3] = 1471,
+	[BNXT_ULP_CLASS_HID_22cef] = 1472,
+	[BNXT_ULP_CLASS_HID_62727] = 1473,
+	[BNXT_ULP_CLASS_HID_62d63] = 1474,
+	[BNXT_ULP_CLASS_HID_61183] = 1475,
+	[BNXT_ULP_CLASS_HID_617df] = 1476,
+	[BNXT_ULP_CLASS_HID_64adb] = 1477,
+	[BNXT_ULP_CLASS_HID_65117] = 1478,
+	[BNXT_ULP_CLASS_HID_63537] = 1479,
+	[BNXT_ULP_CLASS_HID_63b73] = 1480,
+	[BNXT_ULP_CLASS_HID_61417] = 1481,
+	[BNXT_ULP_CLASS_HID_61a53] = 1482,
+	[BNXT_ULP_CLASS_HID_65b3f] = 1483,
+	[BNXT_ULP_CLASS_HID_6048f] = 1484,
+	[BNXT_ULP_CLASS_HID_6378b] = 1485,
+	[BNXT_ULP_CLASS_HID_63dc7] = 1486,
+	[BNXT_ULP_CLASS_HID_621e7] = 1487,
+	[BNXT_ULP_CLASS_HID_62823] = 1488,
+	[BNXT_ULP_CLASS_HID_8b0b] = 1489,
+	[BNXT_ULP_CLASS_HID_9137] = 1490,
+	[BNXT_ULP_CLASS_HID_d223] = 1491,
+	[BNXT_ULP_CLASS_HID_d86f] = 1492,
+	[BNXT_ULP_CLASS_HID_ae9f] = 1493,
+	[BNXT_ULP_CLASS_HID_b4db] = 1494,
+	[BNXT_ULP_CLASS_HID_98fb] = 1495,
+	[BNXT_ULP_CLASS_HID_9f27] = 1496,
+	[BNXT_ULP_CLASS_HID_4863f] = 1497,
+	[BNXT_ULP_CLASS_HID_48c7b] = 1498,
+	[BNXT_ULP_CLASS_HID_4cd57] = 1499,
+	[BNXT_ULP_CLASS_HID_4d393] = 1500,
+	[BNXT_ULP_CLASS_HID_4a9c3] = 1501,
+	[BNXT_ULP_CLASS_HID_4b00f] = 1502,
+	[BNXT_ULP_CLASS_HID_4942f] = 1503,
+	[BNXT_ULP_CLASS_HID_49a6b] = 1504,
+	[BNXT_ULP_CLASS_HID_1a10b] = 1505,
+	[BNXT_ULP_CLASS_HID_1a737] = 1506,
+	[BNXT_ULP_CLASS_HID_18b57] = 1507,
+	[BNXT_ULP_CLASS_HID_19193] = 1508,
+	[BNXT_ULP_CLASS_HID_1c49f] = 1509,
+	[BNXT_ULP_CLASS_HID_1cadb] = 1510,
+	[BNXT_ULP_CLASS_HID_1aefb] = 1511,
+	[BNXT_ULP_CLASS_HID_1b527] = 1512,
+	[BNXT_ULP_CLASS_HID_59c3f] = 1513,
+	[BNXT_ULP_CLASS_HID_5a27b] = 1514,
+	[BNXT_ULP_CLASS_HID_5869b] = 1515,
+	[BNXT_ULP_CLASS_HID_58cc7] = 1516,
+	[BNXT_ULP_CLASS_HID_5bfc3] = 1517,
+	[BNXT_ULP_CLASS_HID_5c60f] = 1518,
+	[BNXT_ULP_CLASS_HID_5aa2f] = 1519,
+	[BNXT_ULP_CLASS_HID_5b06b] = 1520,
+	[BNXT_ULP_CLASS_HID_49ad] = 1521,
+	[BNXT_ULP_CLASS_HID_4fe9] = 1522,
+	[BNXT_ULP_CLASS_HID_0cd9] = 1523,
+	[BNXT_ULP_CLASS_HID_1315] = 1524,
+	[BNXT_ULP_CLASS_HID_230d] = 1525,
+	[BNXT_ULP_CLASS_HID_2949] = 1526,
+	[BNXT_ULP_CLASS_HID_4365] = 1527,
+	[BNXT_ULP_CLASS_HID_49a1] = 1528,
+	[BNXT_ULP_CLASS_HID_4035] = 1529,
+	[BNXT_ULP_CLASS_HID_4671] = 1530,
+	[BNXT_ULP_CLASS_HID_0361] = 1531,
+	[BNXT_ULP_CLASS_HID_09bd] = 1532,
+	[BNXT_ULP_CLASS_HID_1995] = 1533,
+	[BNXT_ULP_CLASS_HID_1fd1] = 1534,
+	[BNXT_ULP_CLASS_HID_398d] = 1535,
+	[BNXT_ULP_CLASS_HID_3fc9] = 1536,
+	[BNXT_ULP_CLASS_HID_444e1] = 1537,
+	[BNXT_ULP_CLASS_HID_44b3d] = 1538,
+	[BNXT_ULP_CLASS_HID_4082d] = 1539,
+	[BNXT_ULP_CLASS_HID_40e69] = 1540,
+	[BNXT_ULP_CLASS_HID_41e41] = 1541,
+	[BNXT_ULP_CLASS_HID_4249d] = 1542,
+	[BNXT_ULP_CLASS_HID_43eb9] = 1543,
+	[BNXT_ULP_CLASS_HID_444f5] = 1544,
+	[BNXT_ULP_CLASS_HID_43b09] = 1545,
+	[BNXT_ULP_CLASS_HID_44145] = 1546,
+	[BNXT_ULP_CLASS_HID_45b61] = 1547,
+	[BNXT_ULP_CLASS_HID_404f1] = 1548,
+	[BNXT_ULP_CLASS_HID_414e9] = 1549,
+	[BNXT_ULP_CLASS_HID_41b25] = 1550,
+	[BNXT_ULP_CLASS_HID_434c1] = 1551,
+	[BNXT_ULP_CLASS_HID_43b1d] = 1552,
+	[BNXT_ULP_CLASS_HID_45829] = 1553,
+	[BNXT_ULP_CLASS_HID_40159] = 1554,
+	[BNXT_ULP_CLASS_HID_43189] = 1555,
+	[BNXT_ULP_CLASS_HID_437f5] = 1556,
+	[BNXT_ULP_CLASS_HID_44e41] = 1557,
+	[BNXT_ULP_CLASS_HID_4548d] = 1558,
+	[BNXT_ULP_CLASS_HID_42821] = 1559,
+	[BNXT_ULP_CLASS_HID_42e6d] = 1560,
+	[BNXT_ULP_CLASS_HID_6271d] = 1561,
+	[BNXT_ULP_CLASS_HID_62d59] = 1562,
+	[BNXT_ULP_CLASS_HID_600fd] = 1563,
+	[BNXT_ULP_CLASS_HID_60739] = 1564,
+	[BNXT_ULP_CLASS_HID_61db5] = 1565,
+	[BNXT_ULP_CLASS_HID_623f1] = 1566,
+	[BNXT_ULP_CLASS_HID_65421] = 1567,
+	[BNXT_ULP_CLASS_HID_65a6d] = 1568,
+	[BNXT_ULP_CLASS_HID_5111d] = 1569,
+	[BNXT_ULP_CLASS_HID_51759] = 1570,
+	[BNXT_ULP_CLASS_HID_54789] = 1571,
+	[BNXT_ULP_CLASS_HID_54df5] = 1572,
+	[BNXT_ULP_CLASS_HID_507b5] = 1573,
+	[BNXT_ULP_CLASS_HID_50df1] = 1574,
+	[BNXT_ULP_CLASS_HID_53e21] = 1575,
+	[BNXT_ULP_CLASS_HID_5446d] = 1576,
+	[BNXT_ULP_CLASS_HID_73d1d] = 1577,
+	[BNXT_ULP_CLASS_HID_74359] = 1578,
+	[BNXT_ULP_CLASS_HID_716fd] = 1579,
+	[BNXT_ULP_CLASS_HID_71d39] = 1580,
+	[BNXT_ULP_CLASS_HID_733b5] = 1581,
+	[BNXT_ULP_CLASS_HID_739f1] = 1582,
+	[BNXT_ULP_CLASS_HID_70d15] = 1583,
+	[BNXT_ULP_CLASS_HID_71351] = 1584,
+	[BNXT_ULP_CLASS_HID_49cd] = 1585,
+	[BNXT_ULP_CLASS_HID_4f89] = 1586,
+	[BNXT_ULP_CLASS_HID_0cb9] = 1587,
+	[BNXT_ULP_CLASS_HID_1375] = 1588,
+	[BNXT_ULP_CLASS_HID_236d] = 1589,
+	[BNXT_ULP_CLASS_HID_2929] = 1590,
+	[BNXT_ULP_CLASS_HID_4305] = 1591,
+	[BNXT_ULP_CLASS_HID_49c1] = 1592,
+	[BNXT_ULP_CLASS_HID_4055] = 1593,
+	[BNXT_ULP_CLASS_HID_4611] = 1594,
+	[BNXT_ULP_CLASS_HID_0301] = 1595,
+	[BNXT_ULP_CLASS_HID_09dd] = 1596,
+	[BNXT_ULP_CLASS_HID_19f5] = 1597,
+	[BNXT_ULP_CLASS_HID_1fb1] = 1598,
+	[BNXT_ULP_CLASS_HID_39ed] = 1599,
+	[BNXT_ULP_CLASS_HID_3fa9] = 1600,
+	[BNXT_ULP_CLASS_HID_44481] = 1601,
+	[BNXT_ULP_CLASS_HID_44b5d] = 1602,
+	[BNXT_ULP_CLASS_HID_4084d] = 1603,
+	[BNXT_ULP_CLASS_HID_40e09] = 1604,
+	[BNXT_ULP_CLASS_HID_41e21] = 1605,
+	[BNXT_ULP_CLASS_HID_424fd] = 1606,
+	[BNXT_ULP_CLASS_HID_43ed9] = 1607,
+	[BNXT_ULP_CLASS_HID_44495] = 1608,
+	[BNXT_ULP_CLASS_HID_43b69] = 1609,
+	[BNXT_ULP_CLASS_HID_44125] = 1610,
+	[BNXT_ULP_CLASS_HID_45b01] = 1611,
+	[BNXT_ULP_CLASS_HID_40491] = 1612,
+	[BNXT_ULP_CLASS_HID_41489] = 1613,
+	[BNXT_ULP_CLASS_HID_41b45] = 1614,
+	[BNXT_ULP_CLASS_HID_434a1] = 1615,
+	[BNXT_ULP_CLASS_HID_43b7d] = 1616,
+	[BNXT_ULP_CLASS_HID_45849] = 1617,
+	[BNXT_ULP_CLASS_HID_40139] = 1618,
+	[BNXT_ULP_CLASS_HID_431e9] = 1619,
+	[BNXT_ULP_CLASS_HID_43795] = 1620,
+	[BNXT_ULP_CLASS_HID_44e21] = 1621,
+	[BNXT_ULP_CLASS_HID_454ed] = 1622,
+	[BNXT_ULP_CLASS_HID_42841] = 1623,
+	[BNXT_ULP_CLASS_HID_42e0d] = 1624,
+	[BNXT_ULP_CLASS_HID_6277d] = 1625,
+	[BNXT_ULP_CLASS_HID_62d39] = 1626,
+	[BNXT_ULP_CLASS_HID_6009d] = 1627,
+	[BNXT_ULP_CLASS_HID_60759] = 1628,
+	[BNXT_ULP_CLASS_HID_61dd5] = 1629,
+	[BNXT_ULP_CLASS_HID_62391] = 1630,
+	[BNXT_ULP_CLASS_HID_65441] = 1631,
+	[BNXT_ULP_CLASS_HID_65a0d] = 1632,
+	[BNXT_ULP_CLASS_HID_5117d] = 1633,
+	[BNXT_ULP_CLASS_HID_51739] = 1634,
+	[BNXT_ULP_CLASS_HID_547e9] = 1635,
+	[BNXT_ULP_CLASS_HID_54d95] = 1636,
+	[BNXT_ULP_CLASS_HID_507d5] = 1637,
+	[BNXT_ULP_CLASS_HID_50d91] = 1638,
+	[BNXT_ULP_CLASS_HID_53e41] = 1639,
+	[BNXT_ULP_CLASS_HID_5440d] = 1640,
+	[BNXT_ULP_CLASS_HID_73d7d] = 1641,
+	[BNXT_ULP_CLASS_HID_74339] = 1642,
+	[BNXT_ULP_CLASS_HID_7169d] = 1643,
+	[BNXT_ULP_CLASS_HID_71d59] = 1644,
+	[BNXT_ULP_CLASS_HID_733d5] = 1645,
+	[BNXT_ULP_CLASS_HID_73991] = 1646,
+	[BNXT_ULP_CLASS_HID_70d75] = 1647,
+	[BNXT_ULP_CLASS_HID_71331] = 1648,
+	[BNXT_ULP_CLASS_HID_22c33] = 1649,
+	[BNXT_ULP_CLASS_HID_2320f] = 1650,
+	[BNXT_ULP_CLASS_HID_2166f] = 1651,
+	[BNXT_ULP_CLASS_HID_21cab] = 1652,
+	[BNXT_ULP_CLASS_HID_24fa7] = 1653,
+	[BNXT_ULP_CLASS_HID_255e3] = 1654,
+	[BNXT_ULP_CLASS_HID_239c3] = 1655,
+	[BNXT_ULP_CLASS_HID_2401f] = 1656,
+	[BNXT_ULP_CLASS_HID_218e3] = 1657,
+	[BNXT_ULP_CLASS_HID_21f3f] = 1658,
+	[BNXT_ULP_CLASS_HID_2031f] = 1659,
+	[BNXT_ULP_CLASS_HID_2095b] = 1660,
+	[BNXT_ULP_CLASS_HID_23c57] = 1661,
+	[BNXT_ULP_CLASS_HID_24293] = 1662,
+	[BNXT_ULP_CLASS_HID_226f3] = 1663,
+	[BNXT_ULP_CLASS_HID_22ccf] = 1664,
+	[BNXT_ULP_CLASS_HID_62707] = 1665,
+	[BNXT_ULP_CLASS_HID_62d43] = 1666,
+	[BNXT_ULP_CLASS_HID_611a3] = 1667,
+	[BNXT_ULP_CLASS_HID_617ff] = 1668,
+	[BNXT_ULP_CLASS_HID_64afb] = 1669,
+	[BNXT_ULP_CLASS_HID_65137] = 1670,
+	[BNXT_ULP_CLASS_HID_63517] = 1671,
+	[BNXT_ULP_CLASS_HID_63b53] = 1672,
+	[BNXT_ULP_CLASS_HID_61437] = 1673,
+	[BNXT_ULP_CLASS_HID_61a73] = 1674,
+	[BNXT_ULP_CLASS_HID_65b1f] = 1675,
+	[BNXT_ULP_CLASS_HID_604af] = 1676,
+	[BNXT_ULP_CLASS_HID_637ab] = 1677,
+	[BNXT_ULP_CLASS_HID_63de7] = 1678,
+	[BNXT_ULP_CLASS_HID_621c7] = 1679,
+	[BNXT_ULP_CLASS_HID_62803] = 1680,
+	[BNXT_ULP_CLASS_HID_34233] = 1681,
+	[BNXT_ULP_CLASS_HID_3480f] = 1682,
+	[BNXT_ULP_CLASS_HID_32c6f] = 1683,
+	[BNXT_ULP_CLASS_HID_332ab] = 1684,
+	[BNXT_ULP_CLASS_HID_308fb] = 1685,
+	[BNXT_ULP_CLASS_HID_30f37] = 1686,
+	[BNXT_ULP_CLASS_HID_34fc3] = 1687,
+	[BNXT_ULP_CLASS_HID_3561f] = 1688,
+	[BNXT_ULP_CLASS_HID_32ee3] = 1689,
+	[BNXT_ULP_CLASS_HID_3353f] = 1690,
+	[BNXT_ULP_CLASS_HID_3191f] = 1691,
+	[BNXT_ULP_CLASS_HID_31f5b] = 1692,
+	[BNXT_ULP_CLASS_HID_35257] = 1693,
+	[BNXT_ULP_CLASS_HID_35893] = 1694,
+	[BNXT_ULP_CLASS_HID_33cf3] = 1695,
+	[BNXT_ULP_CLASS_HID_342cf] = 1696,
+	[BNXT_ULP_CLASS_HID_73d07] = 1697,
+	[BNXT_ULP_CLASS_HID_74343] = 1698,
+	[BNXT_ULP_CLASS_HID_727a3] = 1699,
+	[BNXT_ULP_CLASS_HID_72dff] = 1700,
+	[BNXT_ULP_CLASS_HID_703cf] = 1701,
+	[BNXT_ULP_CLASS_HID_70a0b] = 1702,
+	[BNXT_ULP_CLASS_HID_74b17] = 1703,
+	[BNXT_ULP_CLASS_HID_75153] = 1704,
+	[BNXT_ULP_CLASS_HID_72a37] = 1705,
+	[BNXT_ULP_CLASS_HID_73073] = 1706,
+	[BNXT_ULP_CLASS_HID_71453] = 1707,
+	[BNXT_ULP_CLASS_HID_71aaf] = 1708,
+	[BNXT_ULP_CLASS_HID_74dab] = 1709,
+	[BNXT_ULP_CLASS_HID_753e7] = 1710,
+	[BNXT_ULP_CLASS_HID_737c7] = 1711,
+	[BNXT_ULP_CLASS_HID_73e03] = 1712,
+	[BNXT_ULP_CLASS_HID_2b733] = 1713,
+	[BNXT_ULP_CLASS_HID_2bd0f] = 1714,
+	[BNXT_ULP_CLASS_HID_2a16f] = 1715,
+	[BNXT_ULP_CLASS_HID_2a7ab] = 1716,
+	[BNXT_ULP_CLASS_HID_2daa7] = 1717,
+	[BNXT_ULP_CLASS_HID_28437] = 1718,
+	[BNXT_ULP_CLASS_HID_2c4c3] = 1719,
+	[BNXT_ULP_CLASS_HID_2cb1f] = 1720,
+	[BNXT_ULP_CLASS_HID_2a3e3] = 1721,
+	[BNXT_ULP_CLASS_HID_2aa3f] = 1722,
+	[BNXT_ULP_CLASS_HID_28e1f] = 1723,
+	[BNXT_ULP_CLASS_HID_2945b] = 1724,
+	[BNXT_ULP_CLASS_HID_2c757] = 1725,
+	[BNXT_ULP_CLASS_HID_2cd93] = 1726,
+	[BNXT_ULP_CLASS_HID_2b1f3] = 1727,
+	[BNXT_ULP_CLASS_HID_2b7cf] = 1728,
+	[BNXT_ULP_CLASS_HID_6b207] = 1729,
+	[BNXT_ULP_CLASS_HID_6b843] = 1730,
+	[BNXT_ULP_CLASS_HID_69ca3] = 1731,
+	[BNXT_ULP_CLASS_HID_6a2ff] = 1732,
+	[BNXT_ULP_CLASS_HID_6d5fb] = 1733,
+	[BNXT_ULP_CLASS_HID_6dc37] = 1734,
+	[BNXT_ULP_CLASS_HID_6c017] = 1735,
+	[BNXT_ULP_CLASS_HID_6c653] = 1736,
+	[BNXT_ULP_CLASS_HID_69f37] = 1737,
+	[BNXT_ULP_CLASS_HID_6a573] = 1738,
+	[BNXT_ULP_CLASS_HID_68953] = 1739,
+	[BNXT_ULP_CLASS_HID_68faf] = 1740,
+	[BNXT_ULP_CLASS_HID_6c2ab] = 1741,
+	[BNXT_ULP_CLASS_HID_6c8e7] = 1742,
+	[BNXT_ULP_CLASS_HID_6acc7] = 1743,
+	[BNXT_ULP_CLASS_HID_6b303] = 1744,
+	[BNXT_ULP_CLASS_HID_3cd33] = 1745,
+	[BNXT_ULP_CLASS_HID_3d30f] = 1746,
+	[BNXT_ULP_CLASS_HID_3b76f] = 1747,
+	[BNXT_ULP_CLASS_HID_3bdab] = 1748,
+	[BNXT_ULP_CLASS_HID_393fb] = 1749,
+	[BNXT_ULP_CLASS_HID_39a37] = 1750,
+	[BNXT_ULP_CLASS_HID_3dac3] = 1751,
+	[BNXT_ULP_CLASS_HID_38453] = 1752,
+	[BNXT_ULP_CLASS_HID_3b9e3] = 1753,
+	[BNXT_ULP_CLASS_HID_3c03f] = 1754,
+	[BNXT_ULP_CLASS_HID_3a41f] = 1755,
+	[BNXT_ULP_CLASS_HID_3aa5b] = 1756,
+	[BNXT_ULP_CLASS_HID_380ab] = 1757,
+	[BNXT_ULP_CLASS_HID_386e7] = 1758,
+	[BNXT_ULP_CLASS_HID_3c7f3] = 1759,
+	[BNXT_ULP_CLASS_HID_3cdcf] = 1760,
+	[BNXT_ULP_CLASS_HID_7c807] = 1761,
+	[BNXT_ULP_CLASS_HID_7ce43] = 1762,
+	[BNXT_ULP_CLASS_HID_7b2a3] = 1763,
+	[BNXT_ULP_CLASS_HID_7b8ff] = 1764,
+	[BNXT_ULP_CLASS_HID_78ecf] = 1765,
+	[BNXT_ULP_CLASS_HID_7950b] = 1766,
+	[BNXT_ULP_CLASS_HID_7d617] = 1767,
+	[BNXT_ULP_CLASS_HID_7dc53] = 1768,
+	[BNXT_ULP_CLASS_HID_7b537] = 1769,
+	[BNXT_ULP_CLASS_HID_7bb73] = 1770,
+	[BNXT_ULP_CLASS_HID_79f53] = 1771,
+	[BNXT_ULP_CLASS_HID_7a5af] = 1772,
+	[BNXT_ULP_CLASS_HID_7d8ab] = 1773,
+	[BNXT_ULP_CLASS_HID_7823b] = 1774,
+	[BNXT_ULP_CLASS_HID_7c2c7] = 1775,
+	[BNXT_ULP_CLASS_HID_7c903] = 1776,
+	[BNXT_ULP_CLASS_HID_8b2b] = 1777,
+	[BNXT_ULP_CLASS_HID_9117] = 1778,
+	[BNXT_ULP_CLASS_HID_d203] = 1779,
+	[BNXT_ULP_CLASS_HID_d84f] = 1780,
+	[BNXT_ULP_CLASS_HID_aebf] = 1781,
+	[BNXT_ULP_CLASS_HID_b4fb] = 1782,
+	[BNXT_ULP_CLASS_HID_98db] = 1783,
+	[BNXT_ULP_CLASS_HID_9f07] = 1784,
+	[BNXT_ULP_CLASS_HID_4861f] = 1785,
+	[BNXT_ULP_CLASS_HID_48c5b] = 1786,
+	[BNXT_ULP_CLASS_HID_4cd77] = 1787,
+	[BNXT_ULP_CLASS_HID_4d3b3] = 1788,
+	[BNXT_ULP_CLASS_HID_4a9e3] = 1789,
+	[BNXT_ULP_CLASS_HID_4b02f] = 1790,
+	[BNXT_ULP_CLASS_HID_4940f] = 1791,
+	[BNXT_ULP_CLASS_HID_49a4b] = 1792,
+	[BNXT_ULP_CLASS_HID_1a12b] = 1793,
+	[BNXT_ULP_CLASS_HID_1a717] = 1794,
+	[BNXT_ULP_CLASS_HID_18b77] = 1795,
+	[BNXT_ULP_CLASS_HID_191b3] = 1796,
+	[BNXT_ULP_CLASS_HID_1c4bf] = 1797,
+	[BNXT_ULP_CLASS_HID_1cafb] = 1798,
+	[BNXT_ULP_CLASS_HID_1aedb] = 1799,
+	[BNXT_ULP_CLASS_HID_1b507] = 1800,
+	[BNXT_ULP_CLASS_HID_59c1f] = 1801,
+	[BNXT_ULP_CLASS_HID_5a25b] = 1802,
+	[BNXT_ULP_CLASS_HID_586bb] = 1803,
+	[BNXT_ULP_CLASS_HID_58ce7] = 1804,
+	[BNXT_ULP_CLASS_HID_5bfe3] = 1805,
+	[BNXT_ULP_CLASS_HID_5c62f] = 1806,
+	[BNXT_ULP_CLASS_HID_5aa0f] = 1807,
+	[BNXT_ULP_CLASS_HID_5b04b] = 1808,
+	[BNXT_ULP_CLASS_HID_d0ab] = 1809,
+	[BNXT_ULP_CLASS_HID_d697] = 1810,
+	[BNXT_ULP_CLASS_HID_d783] = 1811,
+	[BNXT_ULP_CLASS_HID_c133] = 1812,
+	[BNXT_ULP_CLASS_HID_f43f] = 1813,
+	[BNXT_ULP_CLASS_HID_fa7b] = 1814,
+	[BNXT_ULP_CLASS_HID_de5b] = 1815,
+	[BNXT_ULP_CLASS_HID_e487] = 1816,
+	[BNXT_ULP_CLASS_HID_4cb9f] = 1817,
+	[BNXT_ULP_CLASS_HID_4d1db] = 1818,
+	[BNXT_ULP_CLASS_HID_4d2f7] = 1819,
+	[BNXT_ULP_CLASS_HID_4d933] = 1820,
+	[BNXT_ULP_CLASS_HID_4ef63] = 1821,
+	[BNXT_ULP_CLASS_HID_4f5af] = 1822,
+	[BNXT_ULP_CLASS_HID_4d98f] = 1823,
+	[BNXT_ULP_CLASS_HID_4dfcb] = 1824,
+	[BNXT_ULP_CLASS_HID_1e6ab] = 1825,
+	[BNXT_ULP_CLASS_HID_1ec97] = 1826,
+	[BNXT_ULP_CLASS_HID_1d0f7] = 1827,
+	[BNXT_ULP_CLASS_HID_1d733] = 1828,
+	[BNXT_ULP_CLASS_HID_1ca3f] = 1829,
+	[BNXT_ULP_CLASS_HID_1d07b] = 1830,
+	[BNXT_ULP_CLASS_HID_1f45b] = 1831,
+	[BNXT_ULP_CLASS_HID_1fa87] = 1832,
+	[BNXT_ULP_CLASS_HID_5e19f] = 1833,
+	[BNXT_ULP_CLASS_HID_5e7db] = 1834,
+	[BNXT_ULP_CLASS_HID_5cc3b] = 1835,
+	[BNXT_ULP_CLASS_HID_5d267] = 1836,
+	[BNXT_ULP_CLASS_HID_5c563] = 1837,
+	[BNXT_ULP_CLASS_HID_5cbaf] = 1838,
+	[BNXT_ULP_CLASS_HID_5ef8f] = 1839,
+	[BNXT_ULP_CLASS_HID_5f5cb] = 1840,
+	[BNXT_ULP_CLASS_HID_adeb] = 1841,
+	[BNXT_ULP_CLASS_HID_b3d7] = 1842,
+	[BNXT_ULP_CLASS_HID_f4c3] = 1843,
+	[BNXT_ULP_CLASS_HID_fb0f] = 1844,
+	[BNXT_ULP_CLASS_HID_b17f] = 1845,
+	[BNXT_ULP_CLASS_HID_b7bb] = 1846,
+	[BNXT_ULP_CLASS_HID_bb9b] = 1847,
+	[BNXT_ULP_CLASS_HID_a1c7] = 1848,
+	[BNXT_ULP_CLASS_HID_4a8df] = 1849,
+	[BNXT_ULP_CLASS_HID_4af1b] = 1850,
+	[BNXT_ULP_CLASS_HID_4f037] = 1851,
+	[BNXT_ULP_CLASS_HID_4f673] = 1852,
+	[BNXT_ULP_CLASS_HID_4aca3] = 1853,
+	[BNXT_ULP_CLASS_HID_4b2ef] = 1854,
+	[BNXT_ULP_CLASS_HID_4b6cf] = 1855,
+	[BNXT_ULP_CLASS_HID_4bd0b] = 1856,
+	[BNXT_ULP_CLASS_HID_1a3eb] = 1857,
+	[BNXT_ULP_CLASS_HID_1a9d7] = 1858,
+	[BNXT_ULP_CLASS_HID_1ae37] = 1859,
+	[BNXT_ULP_CLASS_HID_1b473] = 1860,
+	[BNXT_ULP_CLASS_HID_1e77f] = 1861,
+	[BNXT_ULP_CLASS_HID_1edbb] = 1862,
+	[BNXT_ULP_CLASS_HID_1b19b] = 1863,
+	[BNXT_ULP_CLASS_HID_1b7c7] = 1864,
+	[BNXT_ULP_CLASS_HID_5bedf] = 1865,
+	[BNXT_ULP_CLASS_HID_5a51b] = 1866,
+	[BNXT_ULP_CLASS_HID_5a97b] = 1867,
+	[BNXT_ULP_CLASS_HID_5afa7] = 1868,
+	[BNXT_ULP_CLASS_HID_5e2a3] = 1869,
+	[BNXT_ULP_CLASS_HID_5e8ef] = 1870,
+	[BNXT_ULP_CLASS_HID_5accf] = 1871,
+	[BNXT_ULP_CLASS_HID_5b30b] = 1872,
+	[BNXT_ULP_CLASS_HID_f36b] = 1873,
+	[BNXT_ULP_CLASS_HID_f957] = 1874,
+	[BNXT_ULP_CLASS_HID_fa43] = 1875,
+	[BNXT_ULP_CLASS_HID_e3f3] = 1876,
+	[BNXT_ULP_CLASS_HID_f6ff] = 1877,
+	[BNXT_ULP_CLASS_HID_fd3b] = 1878,
+	[BNXT_ULP_CLASS_HID_e11b] = 1879,
+	[BNXT_ULP_CLASS_HID_e747] = 1880,
+	[BNXT_ULP_CLASS_HID_4ee5f] = 1881,
+	[BNXT_ULP_CLASS_HID_4f49b] = 1882,
+	[BNXT_ULP_CLASS_HID_4f5b7] = 1883,
+	[BNXT_ULP_CLASS_HID_4fbf3] = 1884,
+	[BNXT_ULP_CLASS_HID_4f223] = 1885,
+	[BNXT_ULP_CLASS_HID_4f86f] = 1886,
+	[BNXT_ULP_CLASS_HID_4fc4f] = 1887,
+	[BNXT_ULP_CLASS_HID_4e28b] = 1888,
+	[BNXT_ULP_CLASS_HID_1e96b] = 1889,
+	[BNXT_ULP_CLASS_HID_1ef57] = 1890,
+	[BNXT_ULP_CLASS_HID_1f3b7] = 1891,
+	[BNXT_ULP_CLASS_HID_1f9f3] = 1892,
+	[BNXT_ULP_CLASS_HID_1ecff] = 1893,
+	[BNXT_ULP_CLASS_HID_1f33b] = 1894,
+	[BNXT_ULP_CLASS_HID_1f71b] = 1895,
+	[BNXT_ULP_CLASS_HID_1fd47] = 1896,
+	[BNXT_ULP_CLASS_HID_5e45f] = 1897,
+	[BNXT_ULP_CLASS_HID_5ea9b] = 1898,
+	[BNXT_ULP_CLASS_HID_5eefb] = 1899,
+	[BNXT_ULP_CLASS_HID_5f527] = 1900,
+	[BNXT_ULP_CLASS_HID_5e823] = 1901,
+	[BNXT_ULP_CLASS_HID_5ee6f] = 1902,
+	[BNXT_ULP_CLASS_HID_5f24f] = 1903,
+	[BNXT_ULP_CLASS_HID_5f88b] = 1904,
+	[BNXT_ULP_CLASS_HID_22c53] = 1905,
+	[BNXT_ULP_CLASS_HID_2326f] = 1906,
+	[BNXT_ULP_CLASS_HID_2160f] = 1907,
+	[BNXT_ULP_CLASS_HID_21ccb] = 1908,
+	[BNXT_ULP_CLASS_HID_24fc7] = 1909,
+	[BNXT_ULP_CLASS_HID_25583] = 1910,
+	[BNXT_ULP_CLASS_HID_239a3] = 1911,
+	[BNXT_ULP_CLASS_HID_2407f] = 1912,
+	[BNXT_ULP_CLASS_HID_21883] = 1913,
+	[BNXT_ULP_CLASS_HID_21f5f] = 1914,
+	[BNXT_ULP_CLASS_HID_2037f] = 1915,
+	[BNXT_ULP_CLASS_HID_2093b] = 1916,
+	[BNXT_ULP_CLASS_HID_23c37] = 1917,
+	[BNXT_ULP_CLASS_HID_242f3] = 1918,
+	[BNXT_ULP_CLASS_HID_22693] = 1919,
+	[BNXT_ULP_CLASS_HID_22caf] = 1920,
+	[BNXT_ULP_CLASS_HID_62767] = 1921,
+	[BNXT_ULP_CLASS_HID_62d23] = 1922,
+	[BNXT_ULP_CLASS_HID_611c3] = 1923,
+	[BNXT_ULP_CLASS_HID_6179f] = 1924,
+	[BNXT_ULP_CLASS_HID_64a9b] = 1925,
+	[BNXT_ULP_CLASS_HID_65157] = 1926,
+	[BNXT_ULP_CLASS_HID_63577] = 1927,
+	[BNXT_ULP_CLASS_HID_63b33] = 1928,
+	[BNXT_ULP_CLASS_HID_61457] = 1929,
+	[BNXT_ULP_CLASS_HID_61a13] = 1930,
+	[BNXT_ULP_CLASS_HID_65b7f] = 1931,
+	[BNXT_ULP_CLASS_HID_604cf] = 1932,
+	[BNXT_ULP_CLASS_HID_637cb] = 1933,
+	[BNXT_ULP_CLASS_HID_63d87] = 1934,
+	[BNXT_ULP_CLASS_HID_621a7] = 1935,
+	[BNXT_ULP_CLASS_HID_62863] = 1936,
+	[BNXT_ULP_CLASS_HID_34253] = 1937,
+	[BNXT_ULP_CLASS_HID_3486f] = 1938,
+	[BNXT_ULP_CLASS_HID_32c0f] = 1939,
+	[BNXT_ULP_CLASS_HID_332cb] = 1940,
+	[BNXT_ULP_CLASS_HID_3089b] = 1941,
+	[BNXT_ULP_CLASS_HID_30f57] = 1942,
+	[BNXT_ULP_CLASS_HID_34fa3] = 1943,
+	[BNXT_ULP_CLASS_HID_3567f] = 1944,
+	[BNXT_ULP_CLASS_HID_32e83] = 1945,
+	[BNXT_ULP_CLASS_HID_3355f] = 1946,
+	[BNXT_ULP_CLASS_HID_3197f] = 1947,
+	[BNXT_ULP_CLASS_HID_31f3b] = 1948,
+	[BNXT_ULP_CLASS_HID_35237] = 1949,
+	[BNXT_ULP_CLASS_HID_358f3] = 1950,
+	[BNXT_ULP_CLASS_HID_33c93] = 1951,
+	[BNXT_ULP_CLASS_HID_342af] = 1952,
+	[BNXT_ULP_CLASS_HID_73d67] = 1953,
+	[BNXT_ULP_CLASS_HID_74323] = 1954,
+	[BNXT_ULP_CLASS_HID_727c3] = 1955,
+	[BNXT_ULP_CLASS_HID_72d9f] = 1956,
+	[BNXT_ULP_CLASS_HID_703af] = 1957,
+	[BNXT_ULP_CLASS_HID_70a6b] = 1958,
+	[BNXT_ULP_CLASS_HID_74b77] = 1959,
+	[BNXT_ULP_CLASS_HID_75133] = 1960,
+	[BNXT_ULP_CLASS_HID_72a57] = 1961,
+	[BNXT_ULP_CLASS_HID_73013] = 1962,
+	[BNXT_ULP_CLASS_HID_71433] = 1963,
+	[BNXT_ULP_CLASS_HID_71acf] = 1964,
+	[BNXT_ULP_CLASS_HID_74dcb] = 1965,
+	[BNXT_ULP_CLASS_HID_75387] = 1966,
+	[BNXT_ULP_CLASS_HID_737a7] = 1967,
+	[BNXT_ULP_CLASS_HID_73e63] = 1968,
+	[BNXT_ULP_CLASS_HID_2b753] = 1969,
+	[BNXT_ULP_CLASS_HID_2bd6f] = 1970,
+	[BNXT_ULP_CLASS_HID_2a10f] = 1971,
+	[BNXT_ULP_CLASS_HID_2a7cb] = 1972,
+	[BNXT_ULP_CLASS_HID_2dac7] = 1973,
+	[BNXT_ULP_CLASS_HID_28457] = 1974,
+	[BNXT_ULP_CLASS_HID_2c4a3] = 1975,
+	[BNXT_ULP_CLASS_HID_2cb7f] = 1976,
+	[BNXT_ULP_CLASS_HID_2a383] = 1977,
+	[BNXT_ULP_CLASS_HID_2aa5f] = 1978,
+	[BNXT_ULP_CLASS_HID_28e7f] = 1979,
+	[BNXT_ULP_CLASS_HID_2943b] = 1980,
+	[BNXT_ULP_CLASS_HID_2c737] = 1981,
+	[BNXT_ULP_CLASS_HID_2cdf3] = 1982,
+	[BNXT_ULP_CLASS_HID_2b193] = 1983,
+	[BNXT_ULP_CLASS_HID_2b7af] = 1984,
+	[BNXT_ULP_CLASS_HID_6b267] = 1985,
+	[BNXT_ULP_CLASS_HID_6b823] = 1986,
+	[BNXT_ULP_CLASS_HID_69cc3] = 1987,
+	[BNXT_ULP_CLASS_HID_6a29f] = 1988,
+	[BNXT_ULP_CLASS_HID_6d59b] = 1989,
+	[BNXT_ULP_CLASS_HID_6dc57] = 1990,
+	[BNXT_ULP_CLASS_HID_6c077] = 1991,
+	[BNXT_ULP_CLASS_HID_6c633] = 1992,
+	[BNXT_ULP_CLASS_HID_69f57] = 1993,
+	[BNXT_ULP_CLASS_HID_6a513] = 1994,
+	[BNXT_ULP_CLASS_HID_68933] = 1995,
+	[BNXT_ULP_CLASS_HID_68fcf] = 1996,
+	[BNXT_ULP_CLASS_HID_6c2cb] = 1997,
+	[BNXT_ULP_CLASS_HID_6c887] = 1998,
+	[BNXT_ULP_CLASS_HID_6aca7] = 1999,
+	[BNXT_ULP_CLASS_HID_6b363] = 2000,
+	[BNXT_ULP_CLASS_HID_3cd53] = 2001,
+	[BNXT_ULP_CLASS_HID_3d36f] = 2002,
+	[BNXT_ULP_CLASS_HID_3b70f] = 2003,
+	[BNXT_ULP_CLASS_HID_3bdcb] = 2004,
+	[BNXT_ULP_CLASS_HID_3939b] = 2005,
+	[BNXT_ULP_CLASS_HID_39a57] = 2006,
+	[BNXT_ULP_CLASS_HID_3daa3] = 2007,
+	[BNXT_ULP_CLASS_HID_38433] = 2008,
+	[BNXT_ULP_CLASS_HID_3b983] = 2009,
+	[BNXT_ULP_CLASS_HID_3c05f] = 2010,
+	[BNXT_ULP_CLASS_HID_3a47f] = 2011,
+	[BNXT_ULP_CLASS_HID_3aa3b] = 2012,
+	[BNXT_ULP_CLASS_HID_380cb] = 2013,
+	[BNXT_ULP_CLASS_HID_38687] = 2014,
+	[BNXT_ULP_CLASS_HID_3c793] = 2015,
+	[BNXT_ULP_CLASS_HID_3cdaf] = 2016,
+	[BNXT_ULP_CLASS_HID_7c867] = 2017,
+	[BNXT_ULP_CLASS_HID_7ce23] = 2018,
+	[BNXT_ULP_CLASS_HID_7b2c3] = 2019,
+	[BNXT_ULP_CLASS_HID_7b89f] = 2020,
+	[BNXT_ULP_CLASS_HID_78eaf] = 2021,
+	[BNXT_ULP_CLASS_HID_7956b] = 2022,
+	[BNXT_ULP_CLASS_HID_7d677] = 2023,
+	[BNXT_ULP_CLASS_HID_7dc33] = 2024,
+	[BNXT_ULP_CLASS_HID_7b557] = 2025,
+	[BNXT_ULP_CLASS_HID_7bb13] = 2026,
+	[BNXT_ULP_CLASS_HID_79f33] = 2027,
+	[BNXT_ULP_CLASS_HID_7a5cf] = 2028,
+	[BNXT_ULP_CLASS_HID_7d8cb] = 2029,
+	[BNXT_ULP_CLASS_HID_7825b] = 2030,
+	[BNXT_ULP_CLASS_HID_7c2a7] = 2031,
+	[BNXT_ULP_CLASS_HID_7c963] = 2032,
+	[BNXT_ULP_CLASS_HID_8b4b] = 2033,
+	[BNXT_ULP_CLASS_HID_9177] = 2034,
+	[BNXT_ULP_CLASS_HID_d263] = 2035,
+	[BNXT_ULP_CLASS_HID_d82f] = 2036,
+	[BNXT_ULP_CLASS_HID_aedf] = 2037,
+	[BNXT_ULP_CLASS_HID_b49b] = 2038,
+	[BNXT_ULP_CLASS_HID_98bb] = 2039,
+	[BNXT_ULP_CLASS_HID_9f67] = 2040,
+	[BNXT_ULP_CLASS_HID_4867f] = 2041,
+	[BNXT_ULP_CLASS_HID_48c3b] = 2042,
+	[BNXT_ULP_CLASS_HID_4cd17] = 2043,
+	[BNXT_ULP_CLASS_HID_4d3d3] = 2044,
+	[BNXT_ULP_CLASS_HID_4a983] = 2045,
+	[BNXT_ULP_CLASS_HID_4b04f] = 2046,
+	[BNXT_ULP_CLASS_HID_4946f] = 2047,
+	[BNXT_ULP_CLASS_HID_49a2b] = 2048,
+	[BNXT_ULP_CLASS_HID_1a14b] = 2049,
+	[BNXT_ULP_CLASS_HID_1a777] = 2050,
+	[BNXT_ULP_CLASS_HID_18b17] = 2051,
+	[BNXT_ULP_CLASS_HID_191d3] = 2052,
+	[BNXT_ULP_CLASS_HID_1c4df] = 2053,
+	[BNXT_ULP_CLASS_HID_1ca9b] = 2054,
+	[BNXT_ULP_CLASS_HID_1aebb] = 2055,
+	[BNXT_ULP_CLASS_HID_1b567] = 2056,
+	[BNXT_ULP_CLASS_HID_59c7f] = 2057,
+	[BNXT_ULP_CLASS_HID_5a23b] = 2058,
+	[BNXT_ULP_CLASS_HID_586db] = 2059,
+	[BNXT_ULP_CLASS_HID_58c87] = 2060,
+	[BNXT_ULP_CLASS_HID_5bf83] = 2061,
+	[BNXT_ULP_CLASS_HID_5c64f] = 2062,
+	[BNXT_ULP_CLASS_HID_5aa6f] = 2063,
+	[BNXT_ULP_CLASS_HID_5b02b] = 2064,
+	[BNXT_ULP_CLASS_HID_d0cb] = 2065,
+	[BNXT_ULP_CLASS_HID_d6f7] = 2066,
+	[BNXT_ULP_CLASS_HID_d7e3] = 2067,
+	[BNXT_ULP_CLASS_HID_c153] = 2068,
+	[BNXT_ULP_CLASS_HID_f45f] = 2069,
+	[BNXT_ULP_CLASS_HID_fa1b] = 2070,
+	[BNXT_ULP_CLASS_HID_de3b] = 2071,
+	[BNXT_ULP_CLASS_HID_e4e7] = 2072,
+	[BNXT_ULP_CLASS_HID_4cbff] = 2073,
+	[BNXT_ULP_CLASS_HID_4d1bb] = 2074,
+	[BNXT_ULP_CLASS_HID_4d297] = 2075,
+	[BNXT_ULP_CLASS_HID_4d953] = 2076,
+	[BNXT_ULP_CLASS_HID_4ef03] = 2077,
+	[BNXT_ULP_CLASS_HID_4f5cf] = 2078,
+	[BNXT_ULP_CLASS_HID_4d9ef] = 2079,
+	[BNXT_ULP_CLASS_HID_4dfab] = 2080,
+	[BNXT_ULP_CLASS_HID_1e6cb] = 2081,
+	[BNXT_ULP_CLASS_HID_1ecf7] = 2082,
+	[BNXT_ULP_CLASS_HID_1d097] = 2083,
+	[BNXT_ULP_CLASS_HID_1d753] = 2084,
+	[BNXT_ULP_CLASS_HID_1ca5f] = 2085,
+	[BNXT_ULP_CLASS_HID_1d01b] = 2086,
+	[BNXT_ULP_CLASS_HID_1f43b] = 2087,
+	[BNXT_ULP_CLASS_HID_1fae7] = 2088,
+	[BNXT_ULP_CLASS_HID_5e1ff] = 2089,
+	[BNXT_ULP_CLASS_HID_5e7bb] = 2090,
+	[BNXT_ULP_CLASS_HID_5cc5b] = 2091,
+	[BNXT_ULP_CLASS_HID_5d207] = 2092,
+	[BNXT_ULP_CLASS_HID_5c503] = 2093,
+	[BNXT_ULP_CLASS_HID_5cbcf] = 2094,
+	[BNXT_ULP_CLASS_HID_5efef] = 2095,
+	[BNXT_ULP_CLASS_HID_5f5ab] = 2096,
+	[BNXT_ULP_CLASS_HID_ad8b] = 2097,
+	[BNXT_ULP_CLASS_HID_b3b7] = 2098,
+	[BNXT_ULP_CLASS_HID_f4a3] = 2099,
+	[BNXT_ULP_CLASS_HID_fb6f] = 2100,
+	[BNXT_ULP_CLASS_HID_b11f] = 2101,
+	[BNXT_ULP_CLASS_HID_b7db] = 2102,
+	[BNXT_ULP_CLASS_HID_bbfb] = 2103,
+	[BNXT_ULP_CLASS_HID_a1a7] = 2104,
+	[BNXT_ULP_CLASS_HID_4a8bf] = 2105,
+	[BNXT_ULP_CLASS_HID_4af7b] = 2106,
+	[BNXT_ULP_CLASS_HID_4f057] = 2107,
+	[BNXT_ULP_CLASS_HID_4f613] = 2108,
+	[BNXT_ULP_CLASS_HID_4acc3] = 2109,
+	[BNXT_ULP_CLASS_HID_4b28f] = 2110,
+	[BNXT_ULP_CLASS_HID_4b6af] = 2111,
+	[BNXT_ULP_CLASS_HID_4bd6b] = 2112,
+	[BNXT_ULP_CLASS_HID_1a38b] = 2113,
+	[BNXT_ULP_CLASS_HID_1a9b7] = 2114,
+	[BNXT_ULP_CLASS_HID_1ae57] = 2115,
+	[BNXT_ULP_CLASS_HID_1b413] = 2116,
+	[BNXT_ULP_CLASS_HID_1e71f] = 2117,
+	[BNXT_ULP_CLASS_HID_1eddb] = 2118,
+	[BNXT_ULP_CLASS_HID_1b1fb] = 2119,
+	[BNXT_ULP_CLASS_HID_1b7a7] = 2120,
+	[BNXT_ULP_CLASS_HID_5bebf] = 2121,
+	[BNXT_ULP_CLASS_HID_5a57b] = 2122,
+	[BNXT_ULP_CLASS_HID_5a91b] = 2123,
+	[BNXT_ULP_CLASS_HID_5afc7] = 2124,
+	[BNXT_ULP_CLASS_HID_5e2c3] = 2125,
+	[BNXT_ULP_CLASS_HID_5e88f] = 2126,
+	[BNXT_ULP_CLASS_HID_5acaf] = 2127,
+	[BNXT_ULP_CLASS_HID_5b36b] = 2128,
+	[BNXT_ULP_CLASS_HID_f30b] = 2129,
+	[BNXT_ULP_CLASS_HID_f937] = 2130,
+	[BNXT_ULP_CLASS_HID_fa23] = 2131,
+	[BNXT_ULP_CLASS_HID_e393] = 2132,
+	[BNXT_ULP_CLASS_HID_f69f] = 2133,
+	[BNXT_ULP_CLASS_HID_fd5b] = 2134,
+	[BNXT_ULP_CLASS_HID_e17b] = 2135,
+	[BNXT_ULP_CLASS_HID_e727] = 2136,
+	[BNXT_ULP_CLASS_HID_4ee3f] = 2137,
+	[BNXT_ULP_CLASS_HID_4f4fb] = 2138,
+	[BNXT_ULP_CLASS_HID_4f5d7] = 2139,
+	[BNXT_ULP_CLASS_HID_4fb93] = 2140,
+	[BNXT_ULP_CLASS_HID_4f243] = 2141,
+	[BNXT_ULP_CLASS_HID_4f80f] = 2142,
+	[BNXT_ULP_CLASS_HID_4fc2f] = 2143,
+	[BNXT_ULP_CLASS_HID_4e2eb] = 2144,
+	[BNXT_ULP_CLASS_HID_1e90b] = 2145,
+	[BNXT_ULP_CLASS_HID_1ef37] = 2146,
+	[BNXT_ULP_CLASS_HID_1f3d7] = 2147,
+	[BNXT_ULP_CLASS_HID_1f993] = 2148,
+	[BNXT_ULP_CLASS_HID_1ec9f] = 2149,
+	[BNXT_ULP_CLASS_HID_1f35b] = 2150,
+	[BNXT_ULP_CLASS_HID_1f77b] = 2151,
+	[BNXT_ULP_CLASS_HID_1fd27] = 2152,
+	[BNXT_ULP_CLASS_HID_5e43f] = 2153,
+	[BNXT_ULP_CLASS_HID_5eafb] = 2154,
+	[BNXT_ULP_CLASS_HID_5ee9b] = 2155,
+	[BNXT_ULP_CLASS_HID_5f547] = 2156,
+	[BNXT_ULP_CLASS_HID_5e843] = 2157,
+	[BNXT_ULP_CLASS_HID_5ee0f] = 2158,
+	[BNXT_ULP_CLASS_HID_5f22f] = 2159,
+	[BNXT_ULP_CLASS_HID_5f8eb] = 2160,
+	[BNXT_ULP_CLASS_HID_2579] = 2161,
+	[BNXT_ULP_CLASS_HID_2bb5] = 2162,
+	[BNXT_ULP_CLASS_HID_4591] = 2163,
+	[BNXT_ULP_CLASS_HID_4bad] = 2164,
+	[BNXT_ULP_CLASS_HID_2561] = 2165,
+	[BNXT_ULP_CLASS_HID_2bad] = 2166,
+	[BNXT_ULP_CLASS_HID_5bdd] = 2167,
+	[BNXT_ULP_CLASS_HID_054d] = 2168,
+	[BNXT_ULP_CLASS_HID_257b] = 2169,
+	[BNXT_ULP_CLASS_HID_2bb7] = 2170,
+	[BNXT_ULP_CLASS_HID_0fd7] = 2171,
+	[BNXT_ULP_CLASS_HID_1613] = 2172,
+	[BNXT_ULP_CLASS_HID_48ef] = 2173,
+	[BNXT_ULP_CLASS_HID_4f2b] = 2174,
+	[BNXT_ULP_CLASS_HID_334b] = 2175,
+	[BNXT_ULP_CLASS_HID_3987] = 2176,
+	[BNXT_ULP_CLASS_HID_122b] = 2177,
+	[BNXT_ULP_CLASS_HID_1867] = 2178,
+	[BNXT_ULP_CLASS_HID_5973] = 2179,
+	[BNXT_ULP_CLASS_HID_02c3] = 2180,
+	[BNXT_ULP_CLASS_HID_35df] = 2181,
+	[BNXT_ULP_CLASS_HID_3c1b] = 2182,
+	[BNXT_ULP_CLASS_HID_203b] = 2183,
+	[BNXT_ULP_CLASS_HID_2677] = 2184,
+	[BNXT_ULP_CLASS_HID_2563] = 2185,
+	[BNXT_ULP_CLASS_HID_2baf] = 2186,
+	[BNXT_ULP_CLASS_HID_0fcf] = 2187,
+	[BNXT_ULP_CLASS_HID_160b] = 2188,
+	[BNXT_ULP_CLASS_HID_48f7] = 2189,
+	[BNXT_ULP_CLASS_HID_4f33] = 2190,
+	[BNXT_ULP_CLASS_HID_3353] = 2191,
+	[BNXT_ULP_CLASS_HID_399f] = 2192,
+	[BNXT_ULP_CLASS_HID_42097] = 2193,
+	[BNXT_ULP_CLASS_HID_426d3] = 2194,
+	[BNXT_ULP_CLASS_HID_40af3] = 2195,
+	[BNXT_ULP_CLASS_HID_4113f] = 2196,
+	[BNXT_ULP_CLASS_HID_4443b] = 2197,
+	[BNXT_ULP_CLASS_HID_44a67] = 2198,
+	[BNXT_ULP_CLASS_HID_42e87] = 2199,
+	[BNXT_ULP_CLASS_HID_434c3] = 2200,
+	[BNXT_ULP_CLASS_HID_2559] = 2201,
+	[BNXT_ULP_CLASS_HID_2b95] = 2202,
+	[BNXT_ULP_CLASS_HID_45b1] = 2203,
+	[BNXT_ULP_CLASS_HID_4b8d] = 2204,
+	[BNXT_ULP_CLASS_HID_2541] = 2205,
+	[BNXT_ULP_CLASS_HID_2b8d] = 2206,
+	[BNXT_ULP_CLASS_HID_5bfd] = 2207,
+	[BNXT_ULP_CLASS_HID_056d] = 2208,
+	[BNXT_ULP_CLASS_HID_2539] = 2209,
+	[BNXT_ULP_CLASS_HID_2bf5] = 2210,
+	[BNXT_ULP_CLASS_HID_45d1] = 2211,
+	[BNXT_ULP_CLASS_HID_4bed] = 2212,
+	[BNXT_ULP_CLASS_HID_2521] = 2213,
+	[BNXT_ULP_CLASS_HID_2bed] = 2214,
+	[BNXT_ULP_CLASS_HID_5b9d] = 2215,
+	[BNXT_ULP_CLASS_HID_050d] = 2216,
+	[BNXT_ULP_CLASS_HID_255b] = 2217,
+	[BNXT_ULP_CLASS_HID_2b97] = 2218,
+	[BNXT_ULP_CLASS_HID_0ff7] = 2219,
+	[BNXT_ULP_CLASS_HID_1633] = 2220,
+	[BNXT_ULP_CLASS_HID_48cf] = 2221,
+	[BNXT_ULP_CLASS_HID_4f0b] = 2222,
+	[BNXT_ULP_CLASS_HID_336b] = 2223,
+	[BNXT_ULP_CLASS_HID_39a7] = 2224,
+	[BNXT_ULP_CLASS_HID_120b] = 2225,
+	[BNXT_ULP_CLASS_HID_1847] = 2226,
+	[BNXT_ULP_CLASS_HID_5953] = 2227,
+	[BNXT_ULP_CLASS_HID_02e3] = 2228,
+	[BNXT_ULP_CLASS_HID_35ff] = 2229,
+	[BNXT_ULP_CLASS_HID_3c3b] = 2230,
+	[BNXT_ULP_CLASS_HID_201b] = 2231,
+	[BNXT_ULP_CLASS_HID_2657] = 2232,
+	[BNXT_ULP_CLASS_HID_2543] = 2233,
+	[BNXT_ULP_CLASS_HID_2b8f] = 2234,
+	[BNXT_ULP_CLASS_HID_0fef] = 2235,
+	[BNXT_ULP_CLASS_HID_162b] = 2236,
+	[BNXT_ULP_CLASS_HID_48d7] = 2237,
+	[BNXT_ULP_CLASS_HID_4f13] = 2238,
+	[BNXT_ULP_CLASS_HID_3373] = 2239,
+	[BNXT_ULP_CLASS_HID_39bf] = 2240,
+	[BNXT_ULP_CLASS_HID_420b7] = 2241,
+	[BNXT_ULP_CLASS_HID_426f3] = 2242,
+	[BNXT_ULP_CLASS_HID_40ad3] = 2243,
+	[BNXT_ULP_CLASS_HID_4111f] = 2244,
+	[BNXT_ULP_CLASS_HID_4441b] = 2245,
+	[BNXT_ULP_CLASS_HID_44a47] = 2246,
+	[BNXT_ULP_CLASS_HID_42ea7] = 2247,
+	[BNXT_ULP_CLASS_HID_434e3] = 2248,
+	[BNXT_ULP_CLASS_HID_253b] = 2249,
+	[BNXT_ULP_CLASS_HID_2bf7] = 2250,
+	[BNXT_ULP_CLASS_HID_0f97] = 2251,
+	[BNXT_ULP_CLASS_HID_1653] = 2252,
+	[BNXT_ULP_CLASS_HID_48af] = 2253,
+	[BNXT_ULP_CLASS_HID_4f6b] = 2254,
+	[BNXT_ULP_CLASS_HID_330b] = 2255,
+	[BNXT_ULP_CLASS_HID_39c7] = 2256,
+	[BNXT_ULP_CLASS_HID_126b] = 2257,
+	[BNXT_ULP_CLASS_HID_1827] = 2258,
+	[BNXT_ULP_CLASS_HID_5933] = 2259,
+	[BNXT_ULP_CLASS_HID_0283] = 2260,
+	[BNXT_ULP_CLASS_HID_359f] = 2261,
+	[BNXT_ULP_CLASS_HID_3c5b] = 2262,
+	[BNXT_ULP_CLASS_HID_207b] = 2263,
+	[BNXT_ULP_CLASS_HID_2637] = 2264,
+	[BNXT_ULP_CLASS_HID_2523] = 2265,
+	[BNXT_ULP_CLASS_HID_2bef] = 2266,
+	[BNXT_ULP_CLASS_HID_0f8f] = 2267,
+	[BNXT_ULP_CLASS_HID_164b] = 2268,
+	[BNXT_ULP_CLASS_HID_48b7] = 2269,
+	[BNXT_ULP_CLASS_HID_4f73] = 2270,
+	[BNXT_ULP_CLASS_HID_3313] = 2271,
+	[BNXT_ULP_CLASS_HID_39df] = 2272,
+	[BNXT_ULP_CLASS_HID_420d7] = 2273,
+	[BNXT_ULP_CLASS_HID_42693] = 2274,
+	[BNXT_ULP_CLASS_HID_40ab3] = 2275,
+	[BNXT_ULP_CLASS_HID_4117f] = 2276,
+	[BNXT_ULP_CLASS_HID_4447b] = 2277,
+	[BNXT_ULP_CLASS_HID_44a27] = 2278,
+	[BNXT_ULP_CLASS_HID_42ec7] = 2279,
+	[BNXT_ULP_CLASS_HID_43483] = 2280,
+	[BNXT_ULP_CLASS_HID_4156d] = 2281,
+	[BNXT_ULP_CLASS_HID_41b29] = 2282,
+	[BNXT_ULP_CLASS_HID_52b6d] = 2283,
+	[BNXT_ULP_CLASS_HID_53129] = 2284,
+	[BNXT_ULP_CLASS_HID_478a] = 2285,
+	[BNXT_ULP_CLASS_HID_03a6] = 2286,
+	[BNXT_ULP_CLASS_HID_4dce] = 2287,
+	[BNXT_ULP_CLASS_HID_09ea] = 2288,
+	[BNXT_ULP_CLASS_HID_08fe] = 2289,
+	[BNXT_ULP_CLASS_HID_23ce] = 2290,
+	[BNXT_ULP_CLASS_HID_0e02] = 2291,
+	[BNXT_ULP_CLASS_HID_2912] = 2292,
+	[BNXT_ULP_CLASS_HID_3e2a] = 2293,
+	[BNXT_ULP_CLASS_HID_593a] = 2294,
+	[BNXT_ULP_CLASS_HID_246e] = 2295,
+	[BNXT_ULP_CLASS_HID_5f7e] = 2296,
+	[BNXT_ULP_CLASS_HID_5e52] = 2297,
+	[BNXT_ULP_CLASS_HID_1a6e] = 2298,
+	[BNXT_ULP_CLASS_HID_4796] = 2299,
+	[BNXT_ULP_CLASS_HID_03b2] = 2300,
+	[BNXT_ULP_CLASS_HID_4163a] = 2301,
+	[BNXT_ULP_CLASS_HID_4310a] = 2302,
+	[BNXT_ULP_CLASS_HID_41c7e] = 2303,
+	[BNXT_ULP_CLASS_HID_4374e] = 2304,
+	[BNXT_ULP_CLASS_HID_42f8e] = 2305,
+	[BNXT_ULP_CLASS_HID_4469e] = 2306,
+	[BNXT_ULP_CLASS_HID_455c2] = 2307,
+	[BNXT_ULP_CLASS_HID_411ee] = 2308,
+	[BNXT_ULP_CLASS_HID_44b76] = 2309,
+	[BNXT_ULP_CLASS_HID_40692] = 2310,
+	[BNXT_ULP_CLASS_HID_415c6] = 2311,
+	[BNXT_ULP_CLASS_HID_40cd6] = 2312,
+	[BNXT_ULP_CLASS_HID_42516] = 2313,
+	[BNXT_ULP_CLASS_HID_45ce6] = 2314,
+	[BNXT_ULP_CLASS_HID_42b2a] = 2315,
+	[BNXT_ULP_CLASS_HID_4423a] = 2316,
+	[BNXT_ULP_CLASS_HID_229d8] = 2317,
+	[BNXT_ULP_CLASS_HID_240c8] = 2318,
+	[BNXT_ULP_CLASS_HID_22f14] = 2319,
+	[BNXT_ULP_CLASS_HID_24604] = 2320,
+	[BNXT_ULP_CLASS_HID_23374] = 2321,
+	[BNXT_ULP_CLASS_HID_22a64] = 2322,
+	[BNXT_ULP_CLASS_HID_238b0] = 2323,
+	[BNXT_ULP_CLASS_HID_253a0] = 2324,
+	[BNXT_ULP_CLASS_HID_24dac] = 2325,
+	[BNXT_ULP_CLASS_HID_20990] = 2326,
+	[BNXT_ULP_CLASS_HID_214dc] = 2327,
+	[BNXT_ULP_CLASS_HID_20fcc] = 2328,
+	[BNXT_ULP_CLASS_HID_257c8] = 2329,
+	[BNXT_ULP_CLASS_HID_2132c] = 2330,
+	[BNXT_ULP_CLASS_HID_25d04] = 2331,
+	[BNXT_ULP_CLASS_HID_21968] = 2332,
+	[BNXT_ULP_CLASS_HID_234e8] = 2333,
+	[BNXT_ULP_CLASS_HID_22f98] = 2334,
+	[BNXT_ULP_CLASS_HID_23a24] = 2335,
+	[BNXT_ULP_CLASS_HID_255d4] = 2336,
+	[BNXT_ULP_CLASS_HID_21e04] = 2337,
+	[BNXT_ULP_CLASS_HID_23934] = 2338,
+	[BNXT_ULP_CLASS_HID_20440] = 2339,
+	[BNXT_ULP_CLASS_HID_23f70] = 2340,
+	[BNXT_ULP_CLASS_HID_2597c] = 2341,
+	[BNXT_ULP_CLASS_HID_214a0] = 2342,
+	[BNXT_ULP_CLASS_HID_25eb8] = 2343,
+	[BNXT_ULP_CLASS_HID_21a9c] = 2344,
+	[BNXT_ULP_CLASS_HID_22298] = 2345,
+	[BNXT_ULP_CLASS_HID_25d88] = 2346,
+	[BNXT_ULP_CLASS_HID_228d4] = 2347,
+	[BNXT_ULP_CLASS_HID_243c4] = 2348,
+	[BNXT_ULP_CLASS_HID_6220c] = 2349,
+	[BNXT_ULP_CLASS_HID_65d3c] = 2350,
+	[BNXT_ULP_CLASS_HID_62848] = 2351,
+	[BNXT_ULP_CLASS_HID_64378] = 2352,
+	[BNXT_ULP_CLASS_HID_60fa8] = 2353,
+	[BNXT_ULP_CLASS_HID_62758] = 2354,
+	[BNXT_ULP_CLASS_HID_635e4] = 2355,
+	[BNXT_ULP_CLASS_HID_62c94] = 2356,
+	[BNXT_ULP_CLASS_HID_646e0] = 2357,
+	[BNXT_ULP_CLASS_HID_602c4] = 2358,
+	[BNXT_ULP_CLASS_HID_61110] = 2359,
+	[BNXT_ULP_CLASS_HID_60800] = 2360,
+	[BNXT_ULP_CLASS_HID_6503c] = 2361,
+	[BNXT_ULP_CLASS_HID_64b2c] = 2362,
+	[BNXT_ULP_CLASS_HID_65678] = 2363,
+	[BNXT_ULP_CLASS_HID_6125c] = 2364,
+	[BNXT_ULP_CLASS_HID_631dc] = 2365,
+	[BNXT_ULP_CLASS_HID_628cc] = 2366,
+	[BNXT_ULP_CLASS_HID_63718] = 2367,
+	[BNXT_ULP_CLASS_HID_62e08] = 2368,
+	[BNXT_ULP_CLASS_HID_61b78] = 2369,
+	[BNXT_ULP_CLASS_HID_63268] = 2370,
+	[BNXT_ULP_CLASS_HID_600b4] = 2371,
+	[BNXT_ULP_CLASS_HID_63ba4] = 2372,
+	[BNXT_ULP_CLASS_HID_655b0] = 2373,
+	[BNXT_ULP_CLASS_HID_61194] = 2374,
+	[BNXT_ULP_CLASS_HID_65bec] = 2375,
+	[BNXT_ULP_CLASS_HID_617d0] = 2376,
+	[BNXT_ULP_CLASS_HID_63fcc] = 2377,
+	[BNXT_ULP_CLASS_HID_656fc] = 2378,
+	[BNXT_ULP_CLASS_HID_62508] = 2379,
+	[BNXT_ULP_CLASS_HID_65c38] = 2380,
+	[BNXT_ULP_CLASS_HID_86e0] = 2381,
+	[BNXT_ULP_CLASS_HID_a1f0] = 2382,
+	[BNXT_ULP_CLASS_HID_8c2c] = 2383,
+	[BNXT_ULP_CLASS_HID_a73c] = 2384,
+	[BNXT_ULP_CLASS_HID_904c] = 2385,
+	[BNXT_ULP_CLASS_HID_8b5c] = 2386,
+	[BNXT_ULP_CLASS_HID_9988] = 2387,
+	[BNXT_ULP_CLASS_HID_b098] = 2388,
+	[BNXT_ULP_CLASS_HID_aa94] = 2389,
+	[BNXT_ULP_CLASS_HID_c264] = 2390,
+	[BNXT_ULP_CLASS_HID_d0d0] = 2391,
+	[BNXT_ULP_CLASS_HID_cba0] = 2392,
+	[BNXT_ULP_CLASS_HID_b4f0] = 2393,
+	[BNXT_ULP_CLASS_HID_afc0] = 2394,
+	[BNXT_ULP_CLASS_HID_ba3c] = 2395,
+	[BNXT_ULP_CLASS_HID_d50c] = 2396,
+	[BNXT_ULP_CLASS_HID_48334] = 2397,
+	[BNXT_ULP_CLASS_HID_4ba04] = 2398,
+	[BNXT_ULP_CLASS_HID_48970] = 2399,
+	[BNXT_ULP_CLASS_HID_4a040] = 2400,
+	[BNXT_ULP_CLASS_HID_4c84c] = 2401,
+	[BNXT_ULP_CLASS_HID_48460] = 2402,
+	[BNXT_ULP_CLASS_HID_492dc] = 2403,
+	[BNXT_ULP_CLASS_HID_48dac] = 2404,
+	[BNXT_ULP_CLASS_HID_4a7d8] = 2405,
+	[BNXT_ULP_CLASS_HID_4dea8] = 2406,
+	[BNXT_ULP_CLASS_HID_4ade4] = 2407,
+	[BNXT_ULP_CLASS_HID_4c4f4] = 2408,
+	[BNXT_ULP_CLASS_HID_4b104] = 2409,
+	[BNXT_ULP_CLASS_HID_4a814] = 2410,
+	[BNXT_ULP_CLASS_HID_4b740] = 2411,
+	[BNXT_ULP_CLASS_HID_4ae50] = 2412,
+	[BNXT_ULP_CLASS_HID_1bce0] = 2413,
+	[BNXT_ULP_CLASS_HID_1d7f0] = 2414,
+	[BNXT_ULP_CLASS_HID_1a22c] = 2415,
+	[BNXT_ULP_CLASS_HID_1dd3c] = 2416,
+	[BNXT_ULP_CLASS_HID_1864c] = 2417,
+	[BNXT_ULP_CLASS_HID_1a15c] = 2418,
+	[BNXT_ULP_CLASS_HID_18f88] = 2419,
+	[BNXT_ULP_CLASS_HID_1a698] = 2420,
+	[BNXT_ULP_CLASS_HID_1c094] = 2421,
+	[BNXT_ULP_CLASS_HID_19ca8] = 2422,
+	[BNXT_ULP_CLASS_HID_1c6d0] = 2423,
+	[BNXT_ULP_CLASS_HID_182f4] = 2424,
+	[BNXT_ULP_CLASS_HID_1aaf0] = 2425,
+	[BNXT_ULP_CLASS_HID_1c5c0] = 2426,
+	[BNXT_ULP_CLASS_HID_1d03c] = 2427,
+	[BNXT_ULP_CLASS_HID_1cb0c] = 2428,
+	[BNXT_ULP_CLASS_HID_5b934] = 2429,
+	[BNXT_ULP_CLASS_HID_5d004] = 2430,
+	[BNXT_ULP_CLASS_HID_5bf70] = 2431,
+	[BNXT_ULP_CLASS_HID_5d640] = 2432,
+	[BNXT_ULP_CLASS_HID_58290] = 2433,
+	[BNXT_ULP_CLASS_HID_5ba60] = 2434,
+	[BNXT_ULP_CLASS_HID_588dc] = 2435,
+	[BNXT_ULP_CLASS_HID_5a3ac] = 2436,
+	[BNXT_ULP_CLASS_HID_5ddd8] = 2437,
+	[BNXT_ULP_CLASS_HID_599fc] = 2438,
+	[BNXT_ULP_CLASS_HID_5c3e4] = 2439,
+	[BNXT_ULP_CLASS_HID_59f38] = 2440,
+	[BNXT_ULP_CLASS_HID_5a704] = 2441,
+	[BNXT_ULP_CLASS_HID_5de14] = 2442,
+	[BNXT_ULP_CLASS_HID_5ad40] = 2443,
+	[BNXT_ULP_CLASS_HID_5c450] = 2444,
+	[BNXT_ULP_CLASS_HID_47aa] = 2445,
+	[BNXT_ULP_CLASS_HID_0386] = 2446,
+	[BNXT_ULP_CLASS_HID_4dee] = 2447,
+	[BNXT_ULP_CLASS_HID_09ca] = 2448,
+	[BNXT_ULP_CLASS_HID_08de] = 2449,
+	[BNXT_ULP_CLASS_HID_23ee] = 2450,
+	[BNXT_ULP_CLASS_HID_0e22] = 2451,
+	[BNXT_ULP_CLASS_HID_2932] = 2452,
+	[BNXT_ULP_CLASS_HID_3e0a] = 2453,
+	[BNXT_ULP_CLASS_HID_591a] = 2454,
+	[BNXT_ULP_CLASS_HID_244e] = 2455,
+	[BNXT_ULP_CLASS_HID_5f5e] = 2456,
+	[BNXT_ULP_CLASS_HID_5e72] = 2457,
+	[BNXT_ULP_CLASS_HID_1a4e] = 2458,
+	[BNXT_ULP_CLASS_HID_47b6] = 2459,
+	[BNXT_ULP_CLASS_HID_0392] = 2460,
+	[BNXT_ULP_CLASS_HID_5dc2] = 2461,
+	[BNXT_ULP_CLASS_HID_191e] = 2462,
+	[BNXT_ULP_CLASS_HID_4306] = 2463,
+	[BNXT_ULP_CLASS_HID_1f62] = 2464,
+	[BNXT_ULP_CLASS_HID_1e76] = 2465,
+	[BNXT_ULP_CLASS_HID_3906] = 2466,
+	[BNXT_ULP_CLASS_HID_07ba] = 2467,
+	[BNXT_ULP_CLASS_HID_3f4a] = 2468,
+	[BNXT_ULP_CLASS_HID_37a2] = 2469,
+	[BNXT_ULP_CLASS_HID_2eb2] = 2470,
+	[BNXT_ULP_CLASS_HID_3de6] = 2471,
+	[BNXT_ULP_CLASS_HID_54f6] = 2472,
+	[BNXT_ULP_CLASS_HID_578a] = 2473,
+	[BNXT_ULP_CLASS_HID_13e6] = 2474,
+	[BNXT_ULP_CLASS_HID_5dce] = 2475,
+	[BNXT_ULP_CLASS_HID_192a] = 2476,
+	[BNXT_ULP_CLASS_HID_440f6] = 2477,
+	[BNXT_ULP_CLASS_HID_41cd2] = 2478,
+	[BNXT_ULP_CLASS_HID_4463a] = 2479,
+	[BNXT_ULP_CLASS_HID_40216] = 2480,
+	[BNXT_ULP_CLASS_HID_4052a] = 2481,
+	[BNXT_ULP_CLASS_HID_43c3a] = 2482,
+	[BNXT_ULP_CLASS_HID_40b6e] = 2483,
+	[BNXT_ULP_CLASS_HID_4227e] = 2484,
+	[BNXT_ULP_CLASS_HID_43b56] = 2485,
+	[BNXT_ULP_CLASS_HID_45266] = 2486,
+	[BNXT_ULP_CLASS_HID_4209a] = 2487,
+	[BNXT_ULP_CLASS_HID_45baa] = 2488,
+	[BNXT_ULP_CLASS_HID_45abe] = 2489,
+	[BNXT_ULP_CLASS_HID_4169a] = 2490,
+	[BNXT_ULP_CLASS_HID_44082] = 2491,
+	[BNXT_ULP_CLASS_HID_41cde] = 2492,
+	[BNXT_ULP_CLASS_HID_4560e] = 2493,
+	[BNXT_ULP_CLASS_HID_4126a] = 2494,
+	[BNXT_ULP_CLASS_HID_45c52] = 2495,
+	[BNXT_ULP_CLASS_HID_41bae] = 2496,
+	[BNXT_ULP_CLASS_HID_41b42] = 2497,
+	[BNXT_ULP_CLASS_HID_43252] = 2498,
+	[BNXT_ULP_CLASS_HID_40086] = 2499,
+	[BNXT_ULP_CLASS_HID_43b96] = 2500,
+	[BNXT_ULP_CLASS_HID_430ee] = 2501,
+	[BNXT_ULP_CLASS_HID_42bfe] = 2502,
+	[BNXT_ULP_CLASS_HID_43632] = 2503,
+	[BNXT_ULP_CLASS_HID_451c2] = 2504,
+	[BNXT_ULP_CLASS_HID_450d6] = 2505,
+	[BNXT_ULP_CLASS_HID_44be6] = 2506,
+	[BNXT_ULP_CLASS_HID_4561a] = 2507,
+	[BNXT_ULP_CLASS_HID_41276] = 2508,
+	[BNXT_ULP_CLASS_HID_4161a] = 2509,
+	[BNXT_ULP_CLASS_HID_4312a] = 2510,
+	[BNXT_ULP_CLASS_HID_41c5e] = 2511,
+	[BNXT_ULP_CLASS_HID_4376e] = 2512,
+	[BNXT_ULP_CLASS_HID_42fae] = 2513,
+	[BNXT_ULP_CLASS_HID_446be] = 2514,
+	[BNXT_ULP_CLASS_HID_455e2] = 2515,
+	[BNXT_ULP_CLASS_HID_411ce] = 2516,
+	[BNXT_ULP_CLASS_HID_44b56] = 2517,
+	[BNXT_ULP_CLASS_HID_406b2] = 2518,
+	[BNXT_ULP_CLASS_HID_415e6] = 2519,
+	[BNXT_ULP_CLASS_HID_40cf6] = 2520,
+	[BNXT_ULP_CLASS_HID_42536] = 2521,
+	[BNXT_ULP_CLASS_HID_45cc6] = 2522,
+	[BNXT_ULP_CLASS_HID_42b0a] = 2523,
+	[BNXT_ULP_CLASS_HID_4421a] = 2524,
+	[BNXT_ULP_CLASS_HID_6221a] = 2525,
+	[BNXT_ULP_CLASS_HID_65d2a] = 2526,
+	[BNXT_ULP_CLASS_HID_6285e] = 2527,
+	[BNXT_ULP_CLASS_HID_6436e] = 2528,
+	[BNXT_ULP_CLASS_HID_61cfa] = 2529,
+	[BNXT_ULP_CLASS_HID_6378a] = 2530,
+	[BNXT_ULP_CLASS_HID_6023e] = 2531,
+	[BNXT_ULP_CLASS_HID_63dce] = 2532,
+	[BNXT_ULP_CLASS_HID_63ba2] = 2533,
+	[BNXT_ULP_CLASS_HID_652b2] = 2534,
+	[BNXT_ULP_CLASS_HID_621e6] = 2535,
+	[BNXT_ULP_CLASS_HID_658f6] = 2536,
+	[BNXT_ULP_CLASS_HID_61202] = 2537,
+	[BNXT_ULP_CLASS_HID_60d12] = 2538,
+	[BNXT_ULP_CLASS_HID_61846] = 2539,
+	[BNXT_ULP_CLASS_HID_63356] = 2540,
+	[BNXT_ULP_CLASS_HID_50c1a] = 2541,
+	[BNXT_ULP_CLASS_HID_5272a] = 2542,
+	[BNXT_ULP_CLASS_HID_5325e] = 2543,
+	[BNXT_ULP_CLASS_HID_52d6e] = 2544,
+	[BNXT_ULP_CLASS_HID_545ae] = 2545,
+	[BNXT_ULP_CLASS_HID_5018a] = 2546,
+	[BNXT_ULP_CLASS_HID_54be2] = 2547,
+	[BNXT_ULP_CLASS_HID_507ce] = 2548,
+	[BNXT_ULP_CLASS_HID_505a2] = 2549,
+	[BNXT_ULP_CLASS_HID_53cb2] = 2550,
+	[BNXT_ULP_CLASS_HID_50be6] = 2551,
+	[BNXT_ULP_CLASS_HID_522f6] = 2552,
+	[BNXT_ULP_CLASS_HID_55b36] = 2553,
+	[BNXT_ULP_CLASS_HID_51712] = 2554,
+	[BNXT_ULP_CLASS_HID_5410a] = 2555,
+	[BNXT_ULP_CLASS_HID_51d56] = 2556,
+	[BNXT_ULP_CLASS_HID_7581a] = 2557,
+	[BNXT_ULP_CLASS_HID_71466] = 2558,
+	[BNXT_ULP_CLASS_HID_75e5e] = 2559,
+	[BNXT_ULP_CLASS_HID_71dba] = 2560,
+	[BNXT_ULP_CLASS_HID_732fa] = 2561,
+	[BNXT_ULP_CLASS_HID_72d8a] = 2562,
+	[BNXT_ULP_CLASS_HID_7383e] = 2563,
+	[BNXT_ULP_CLASS_HID_753ce] = 2564,
+	[BNXT_ULP_CLASS_HID_751a2] = 2565,
+	[BNXT_ULP_CLASS_HID_748b2] = 2566,
+	[BNXT_ULP_CLASS_HID_757e6] = 2567,
+	[BNXT_ULP_CLASS_HID_713c2] = 2568,
+	[BNXT_ULP_CLASS_HID_70802] = 2569,
+	[BNXT_ULP_CLASS_HID_72312] = 2570,
+	[BNXT_ULP_CLASS_HID_70e46] = 2571,
+	[BNXT_ULP_CLASS_HID_72956] = 2572,
+	[BNXT_ULP_CLASS_HID_47ca] = 2573,
+	[BNXT_ULP_CLASS_HID_03e6] = 2574,
+	[BNXT_ULP_CLASS_HID_4d8e] = 2575,
+	[BNXT_ULP_CLASS_HID_09aa] = 2576,
+	[BNXT_ULP_CLASS_HID_08be] = 2577,
+	[BNXT_ULP_CLASS_HID_238e] = 2578,
+	[BNXT_ULP_CLASS_HID_0e42] = 2579,
+	[BNXT_ULP_CLASS_HID_2952] = 2580,
+	[BNXT_ULP_CLASS_HID_3e6a] = 2581,
+	[BNXT_ULP_CLASS_HID_597a] = 2582,
+	[BNXT_ULP_CLASS_HID_242e] = 2583,
+	[BNXT_ULP_CLASS_HID_5f3e] = 2584,
+	[BNXT_ULP_CLASS_HID_5e12] = 2585,
+	[BNXT_ULP_CLASS_HID_1a2e] = 2586,
+	[BNXT_ULP_CLASS_HID_47d6] = 2587,
+	[BNXT_ULP_CLASS_HID_03f2] = 2588,
+	[BNXT_ULP_CLASS_HID_5da2] = 2589,
+	[BNXT_ULP_CLASS_HID_197e] = 2590,
+	[BNXT_ULP_CLASS_HID_4366] = 2591,
+	[BNXT_ULP_CLASS_HID_1f02] = 2592,
+	[BNXT_ULP_CLASS_HID_1e16] = 2593,
+	[BNXT_ULP_CLASS_HID_3966] = 2594,
+	[BNXT_ULP_CLASS_HID_07da] = 2595,
+	[BNXT_ULP_CLASS_HID_3f2a] = 2596,
+	[BNXT_ULP_CLASS_HID_37c2] = 2597,
+	[BNXT_ULP_CLASS_HID_2ed2] = 2598,
+	[BNXT_ULP_CLASS_HID_3d86] = 2599,
+	[BNXT_ULP_CLASS_HID_5496] = 2600,
+	[BNXT_ULP_CLASS_HID_57ea] = 2601,
+	[BNXT_ULP_CLASS_HID_1386] = 2602,
+	[BNXT_ULP_CLASS_HID_5dae] = 2603,
+	[BNXT_ULP_CLASS_HID_194a] = 2604,
+	[BNXT_ULP_CLASS_HID_44096] = 2605,
+	[BNXT_ULP_CLASS_HID_41cb2] = 2606,
+	[BNXT_ULP_CLASS_HID_4465a] = 2607,
+	[BNXT_ULP_CLASS_HID_40276] = 2608,
+	[BNXT_ULP_CLASS_HID_4054a] = 2609,
+	[BNXT_ULP_CLASS_HID_43c5a] = 2610,
+	[BNXT_ULP_CLASS_HID_40b0e] = 2611,
+	[BNXT_ULP_CLASS_HID_4221e] = 2612,
+	[BNXT_ULP_CLASS_HID_43b36] = 2613,
+	[BNXT_ULP_CLASS_HID_45206] = 2614,
+	[BNXT_ULP_CLASS_HID_420fa] = 2615,
+	[BNXT_ULP_CLASS_HID_45bca] = 2616,
+	[BNXT_ULP_CLASS_HID_45ade] = 2617,
+	[BNXT_ULP_CLASS_HID_416fa] = 2618,
+	[BNXT_ULP_CLASS_HID_440e2] = 2619,
+	[BNXT_ULP_CLASS_HID_41cbe] = 2620,
+	[BNXT_ULP_CLASS_HID_4566e] = 2621,
+	[BNXT_ULP_CLASS_HID_4120a] = 2622,
+	[BNXT_ULP_CLASS_HID_45c32] = 2623,
+	[BNXT_ULP_CLASS_HID_41bce] = 2624,
+	[BNXT_ULP_CLASS_HID_41b22] = 2625,
+	[BNXT_ULP_CLASS_HID_43232] = 2626,
+	[BNXT_ULP_CLASS_HID_400e6] = 2627,
+	[BNXT_ULP_CLASS_HID_43bf6] = 2628,
+	[BNXT_ULP_CLASS_HID_4308e] = 2629,
+	[BNXT_ULP_CLASS_HID_42b9e] = 2630,
+	[BNXT_ULP_CLASS_HID_43652] = 2631,
+	[BNXT_ULP_CLASS_HID_451a2] = 2632,
+	[BNXT_ULP_CLASS_HID_450b6] = 2633,
+	[BNXT_ULP_CLASS_HID_44b86] = 2634,
+	[BNXT_ULP_CLASS_HID_4567a] = 2635,
+	[BNXT_ULP_CLASS_HID_41216] = 2636,
+	[BNXT_ULP_CLASS_HID_4167a] = 2637,
+	[BNXT_ULP_CLASS_HID_4314a] = 2638,
+	[BNXT_ULP_CLASS_HID_41c3e] = 2639,
+	[BNXT_ULP_CLASS_HID_4370e] = 2640,
+	[BNXT_ULP_CLASS_HID_42fce] = 2641,
+	[BNXT_ULP_CLASS_HID_446de] = 2642,
+	[BNXT_ULP_CLASS_HID_45582] = 2643,
+	[BNXT_ULP_CLASS_HID_411ae] = 2644,
+	[BNXT_ULP_CLASS_HID_44b36] = 2645,
+	[BNXT_ULP_CLASS_HID_406d2] = 2646,
+	[BNXT_ULP_CLASS_HID_41586] = 2647,
+	[BNXT_ULP_CLASS_HID_40c96] = 2648,
+	[BNXT_ULP_CLASS_HID_42556] = 2649,
+	[BNXT_ULP_CLASS_HID_45ca6] = 2650,
+	[BNXT_ULP_CLASS_HID_42b6a] = 2651,
+	[BNXT_ULP_CLASS_HID_4427a] = 2652,
+	[BNXT_ULP_CLASS_HID_6227a] = 2653,
+	[BNXT_ULP_CLASS_HID_65d4a] = 2654,
+	[BNXT_ULP_CLASS_HID_6283e] = 2655,
+	[BNXT_ULP_CLASS_HID_6430e] = 2656,
+	[BNXT_ULP_CLASS_HID_61c9a] = 2657,
+	[BNXT_ULP_CLASS_HID_637ea] = 2658,
+	[BNXT_ULP_CLASS_HID_6025e] = 2659,
+	[BNXT_ULP_CLASS_HID_63dae] = 2660,
+	[BNXT_ULP_CLASS_HID_63bc2] = 2661,
+	[BNXT_ULP_CLASS_HID_652d2] = 2662,
+	[BNXT_ULP_CLASS_HID_62186] = 2663,
+	[BNXT_ULP_CLASS_HID_65896] = 2664,
+	[BNXT_ULP_CLASS_HID_61262] = 2665,
+	[BNXT_ULP_CLASS_HID_60d72] = 2666,
+	[BNXT_ULP_CLASS_HID_61826] = 2667,
+	[BNXT_ULP_CLASS_HID_63336] = 2668,
+	[BNXT_ULP_CLASS_HID_50c7a] = 2669,
+	[BNXT_ULP_CLASS_HID_5274a] = 2670,
+	[BNXT_ULP_CLASS_HID_5323e] = 2671,
+	[BNXT_ULP_CLASS_HID_52d0e] = 2672,
+	[BNXT_ULP_CLASS_HID_545ce] = 2673,
+	[BNXT_ULP_CLASS_HID_501ea] = 2674,
+	[BNXT_ULP_CLASS_HID_54b82] = 2675,
+	[BNXT_ULP_CLASS_HID_507ae] = 2676,
+	[BNXT_ULP_CLASS_HID_505c2] = 2677,
+	[BNXT_ULP_CLASS_HID_53cd2] = 2678,
+	[BNXT_ULP_CLASS_HID_50b86] = 2679,
+	[BNXT_ULP_CLASS_HID_52296] = 2680,
+	[BNXT_ULP_CLASS_HID_55b56] = 2681,
+	[BNXT_ULP_CLASS_HID_51772] = 2682,
+	[BNXT_ULP_CLASS_HID_5416a] = 2683,
+	[BNXT_ULP_CLASS_HID_51d36] = 2684,
+	[BNXT_ULP_CLASS_HID_7587a] = 2685,
+	[BNXT_ULP_CLASS_HID_71406] = 2686,
+	[BNXT_ULP_CLASS_HID_75e3e] = 2687,
+	[BNXT_ULP_CLASS_HID_71dda] = 2688,
+	[BNXT_ULP_CLASS_HID_7329a] = 2689,
+	[BNXT_ULP_CLASS_HID_72dea] = 2690,
+	[BNXT_ULP_CLASS_HID_7385e] = 2691,
+	[BNXT_ULP_CLASS_HID_753ae] = 2692,
+	[BNXT_ULP_CLASS_HID_751c2] = 2693,
+	[BNXT_ULP_CLASS_HID_748d2] = 2694,
+	[BNXT_ULP_CLASS_HID_75786] = 2695,
+	[BNXT_ULP_CLASS_HID_713a2] = 2696,
+	[BNXT_ULP_CLASS_HID_70862] = 2697,
+	[BNXT_ULP_CLASS_HID_72372] = 2698,
+	[BNXT_ULP_CLASS_HID_70e26] = 2699,
+	[BNXT_ULP_CLASS_HID_72936] = 2700,
+	[BNXT_ULP_CLASS_HID_229b8] = 2701,
+	[BNXT_ULP_CLASS_HID_240a8] = 2702,
+	[BNXT_ULP_CLASS_HID_22f74] = 2703,
+	[BNXT_ULP_CLASS_HID_24664] = 2704,
+	[BNXT_ULP_CLASS_HID_23314] = 2705,
+	[BNXT_ULP_CLASS_HID_22a04] = 2706,
+	[BNXT_ULP_CLASS_HID_238d0] = 2707,
+	[BNXT_ULP_CLASS_HID_253c0] = 2708,
+	[BNXT_ULP_CLASS_HID_24dcc] = 2709,
+	[BNXT_ULP_CLASS_HID_209f0] = 2710,
+	[BNXT_ULP_CLASS_HID_214bc] = 2711,
+	[BNXT_ULP_CLASS_HID_20fac] = 2712,
+	[BNXT_ULP_CLASS_HID_257a8] = 2713,
+	[BNXT_ULP_CLASS_HID_2134c] = 2714,
+	[BNXT_ULP_CLASS_HID_25d64] = 2715,
+	[BNXT_ULP_CLASS_HID_21908] = 2716,
+	[BNXT_ULP_CLASS_HID_23488] = 2717,
+	[BNXT_ULP_CLASS_HID_22ff8] = 2718,
+	[BNXT_ULP_CLASS_HID_23a44] = 2719,
+	[BNXT_ULP_CLASS_HID_255b4] = 2720,
+	[BNXT_ULP_CLASS_HID_21e64] = 2721,
+	[BNXT_ULP_CLASS_HID_23954] = 2722,
+	[BNXT_ULP_CLASS_HID_20420] = 2723,
+	[BNXT_ULP_CLASS_HID_23f10] = 2724,
+	[BNXT_ULP_CLASS_HID_2591c] = 2725,
+	[BNXT_ULP_CLASS_HID_214c0] = 2726,
+	[BNXT_ULP_CLASS_HID_25ed8] = 2727,
+	[BNXT_ULP_CLASS_HID_21afc] = 2728,
+	[BNXT_ULP_CLASS_HID_222f8] = 2729,
+	[BNXT_ULP_CLASS_HID_25de8] = 2730,
+	[BNXT_ULP_CLASS_HID_228b4] = 2731,
+	[BNXT_ULP_CLASS_HID_243a4] = 2732,
+	[BNXT_ULP_CLASS_HID_6226c] = 2733,
+	[BNXT_ULP_CLASS_HID_65d5c] = 2734,
+	[BNXT_ULP_CLASS_HID_62828] = 2735,
+	[BNXT_ULP_CLASS_HID_64318] = 2736,
+	[BNXT_ULP_CLASS_HID_60fc8] = 2737,
+	[BNXT_ULP_CLASS_HID_62738] = 2738,
+	[BNXT_ULP_CLASS_HID_63584] = 2739,
+	[BNXT_ULP_CLASS_HID_62cf4] = 2740,
+	[BNXT_ULP_CLASS_HID_64680] = 2741,
+	[BNXT_ULP_CLASS_HID_602a4] = 2742,
+	[BNXT_ULP_CLASS_HID_61170] = 2743,
+	[BNXT_ULP_CLASS_HID_60860] = 2744,
+	[BNXT_ULP_CLASS_HID_6505c] = 2745,
+	[BNXT_ULP_CLASS_HID_64b4c] = 2746,
+	[BNXT_ULP_CLASS_HID_65618] = 2747,
+	[BNXT_ULP_CLASS_HID_6123c] = 2748,
+	[BNXT_ULP_CLASS_HID_631bc] = 2749,
+	[BNXT_ULP_CLASS_HID_628ac] = 2750,
+	[BNXT_ULP_CLASS_HID_63778] = 2751,
+	[BNXT_ULP_CLASS_HID_62e68] = 2752,
+	[BNXT_ULP_CLASS_HID_61b18] = 2753,
+	[BNXT_ULP_CLASS_HID_63208] = 2754,
+	[BNXT_ULP_CLASS_HID_600d4] = 2755,
+	[BNXT_ULP_CLASS_HID_63bc4] = 2756,
+	[BNXT_ULP_CLASS_HID_655d0] = 2757,
+	[BNXT_ULP_CLASS_HID_611f4] = 2758,
+	[BNXT_ULP_CLASS_HID_65b8c] = 2759,
+	[BNXT_ULP_CLASS_HID_617b0] = 2760,
+	[BNXT_ULP_CLASS_HID_63fac] = 2761,
+	[BNXT_ULP_CLASS_HID_6569c] = 2762,
+	[BNXT_ULP_CLASS_HID_62568] = 2763,
+	[BNXT_ULP_CLASS_HID_65c58] = 2764,
+	[BNXT_ULP_CLASS_HID_35fb8] = 2765,
+	[BNXT_ULP_CLASS_HID_31b5c] = 2766,
+	[BNXT_ULP_CLASS_HID_34574] = 2767,
+	[BNXT_ULP_CLASS_HID_30118] = 2768,
+	[BNXT_ULP_CLASS_HID_32914] = 2769,
+	[BNXT_ULP_CLASS_HID_34004] = 2770,
+	[BNXT_ULP_CLASS_HID_32ed0] = 2771,
+	[BNXT_ULP_CLASS_HID_349c0] = 2772,
+	[BNXT_ULP_CLASS_HID_30480] = 2773,
+	[BNXT_ULP_CLASS_HID_33ff0] = 2774,
+	[BNXT_ULP_CLASS_HID_30abc] = 2775,
+	[BNXT_ULP_CLASS_HID_325ac] = 2776,
+	[BNXT_ULP_CLASS_HID_34da8] = 2777,
+	[BNXT_ULP_CLASS_HID_3094c] = 2778,
+	[BNXT_ULP_CLASS_HID_31418] = 2779,
+	[BNXT_ULP_CLASS_HID_30f08] = 2780,
+	[BNXT_ULP_CLASS_HID_32a88] = 2781,
+	[BNXT_ULP_CLASS_HID_345f8] = 2782,
+	[BNXT_ULP_CLASS_HID_35044] = 2783,
+	[BNXT_ULP_CLASS_HID_34bb4] = 2784,
+	[BNXT_ULP_CLASS_HID_33464] = 2785,
+	[BNXT_ULP_CLASS_HID_32f54] = 2786,
+	[BNXT_ULP_CLASS_HID_33a20] = 2787,
+	[BNXT_ULP_CLASS_HID_35510] = 2788,
+	[BNXT_ULP_CLASS_HID_313d0] = 2789,
+	[BNXT_ULP_CLASS_HID_30ac0] = 2790,
+	[BNXT_ULP_CLASS_HID_3198c] = 2791,
+	[BNXT_ULP_CLASS_HID_330fc] = 2792,
+	[BNXT_ULP_CLASS_HID_358f8] = 2793,
+	[BNXT_ULP_CLASS_HID_3149c] = 2794,
+	[BNXT_ULP_CLASS_HID_35eb4] = 2795,
+	[BNXT_ULP_CLASS_HID_31a58] = 2796,
+	[BNXT_ULP_CLASS_HID_7586c] = 2797,
+	[BNXT_ULP_CLASS_HID_71410] = 2798,
+	[BNXT_ULP_CLASS_HID_75e28] = 2799,
+	[BNXT_ULP_CLASS_HID_71dcc] = 2800,
+	[BNXT_ULP_CLASS_HID_725c8] = 2801,
+	[BNXT_ULP_CLASS_HID_75d38] = 2802,
+	[BNXT_ULP_CLASS_HID_72b84] = 2803,
+	[BNXT_ULP_CLASS_HID_742f4] = 2804,
+	[BNXT_ULP_CLASS_HID_701b4] = 2805,
+	[BNXT_ULP_CLASS_HID_738a4] = 2806,
+	[BNXT_ULP_CLASS_HID_70770] = 2807,
+	[BNXT_ULP_CLASS_HID_73e60] = 2808,
+	[BNXT_ULP_CLASS_HID_7465c] = 2809,
+	[BNXT_ULP_CLASS_HID_70200] = 2810,
+	[BNXT_ULP_CLASS_HID_710cc] = 2811,
+	[BNXT_ULP_CLASS_HID_7083c] = 2812,
+	[BNXT_ULP_CLASS_HID_727bc] = 2813,
+	[BNXT_ULP_CLASS_HID_75eac] = 2814,
+	[BNXT_ULP_CLASS_HID_72d78] = 2815,
+	[BNXT_ULP_CLASS_HID_74468] = 2816,
+	[BNXT_ULP_CLASS_HID_73118] = 2817,
+	[BNXT_ULP_CLASS_HID_72808] = 2818,
+	[BNXT_ULP_CLASS_HID_736d4] = 2819,
+	[BNXT_ULP_CLASS_HID_751c4] = 2820,
+	[BNXT_ULP_CLASS_HID_74bd0] = 2821,
+	[BNXT_ULP_CLASS_HID_707f4] = 2822,
+	[BNXT_ULP_CLASS_HID_71240] = 2823,
+	[BNXT_ULP_CLASS_HID_70db0] = 2824,
+	[BNXT_ULP_CLASS_HID_755ac] = 2825,
+	[BNXT_ULP_CLASS_HID_71150] = 2826,
+	[BNXT_ULP_CLASS_HID_75b68] = 2827,
+	[BNXT_ULP_CLASS_HID_7170c] = 2828,
+	[BNXT_ULP_CLASS_HID_2d2b8] = 2829,
+	[BNXT_ULP_CLASS_HID_2cda8] = 2830,
+	[BNXT_ULP_CLASS_HID_2d874] = 2831,
+	[BNXT_ULP_CLASS_HID_29418] = 2832,
+	[BNXT_ULP_CLASS_HID_2bc14] = 2833,
+	[BNXT_ULP_CLASS_HID_2d704] = 2834,
+	[BNXT_ULP_CLASS_HID_2a5d0] = 2835,
+	[BNXT_ULP_CLASS_HID_2dcc0] = 2836,
+	[BNXT_ULP_CLASS_HID_29b80] = 2837,
+	[BNXT_ULP_CLASS_HID_2b2f0] = 2838,
+	[BNXT_ULP_CLASS_HID_281bc] = 2839,
+	[BNXT_ULP_CLASS_HID_2b8ac] = 2840,
+	[BNXT_ULP_CLASS_HID_2c0a8] = 2841,
+	[BNXT_ULP_CLASS_HID_29c4c] = 2842,
+	[BNXT_ULP_CLASS_HID_2c664] = 2843,
+	[BNXT_ULP_CLASS_HID_28208] = 2844,
+	[BNXT_ULP_CLASS_HID_2a188] = 2845,
+	[BNXT_ULP_CLASS_HID_2d8f8] = 2846,
+	[BNXT_ULP_CLASS_HID_2a744] = 2847,
+	[BNXT_ULP_CLASS_HID_2deb4] = 2848,
+	[BNXT_ULP_CLASS_HID_28b64] = 2849,
+	[BNXT_ULP_CLASS_HID_2a254] = 2850,
+	[BNXT_ULP_CLASS_HID_2b120] = 2851,
+	[BNXT_ULP_CLASS_HID_2a810] = 2852,
+	[BNXT_ULP_CLASS_HID_2c21c] = 2853,
+	[BNXT_ULP_CLASS_HID_281c0] = 2854,
+	[BNXT_ULP_CLASS_HID_2cbd8] = 2855,
+	[BNXT_ULP_CLASS_HID_287fc] = 2856,
+	[BNXT_ULP_CLASS_HID_2aff8] = 2857,
+	[BNXT_ULP_CLASS_HID_2c6e8] = 2858,
+	[BNXT_ULP_CLASS_HID_2d5b4] = 2859,
+	[BNXT_ULP_CLASS_HID_29158] = 2860,
+	[BNXT_ULP_CLASS_HID_6af6c] = 2861,
+	[BNXT_ULP_CLASS_HID_6c65c] = 2862,
+	[BNXT_ULP_CLASS_HID_6d528] = 2863,
+	[BNXT_ULP_CLASS_HID_690cc] = 2864,
+	[BNXT_ULP_CLASS_HID_6b8c8] = 2865,
+	[BNXT_ULP_CLASS_HID_6d038] = 2866,
+	[BNXT_ULP_CLASS_HID_6be84] = 2867,
+	[BNXT_ULP_CLASS_HID_6d9f4] = 2868,
+	[BNXT_ULP_CLASS_HID_694b4] = 2869,
+	[BNXT_ULP_CLASS_HID_68fa4] = 2870,
+	[BNXT_ULP_CLASS_HID_69a70] = 2871,
+	[BNXT_ULP_CLASS_HID_6b560] = 2872,
+	[BNXT_ULP_CLASS_HID_6dd5c] = 2873,
+	[BNXT_ULP_CLASS_HID_69900] = 2874,
+	[BNXT_ULP_CLASS_HID_6c318] = 2875,
+	[BNXT_ULP_CLASS_HID_69f3c] = 2876,
+	[BNXT_ULP_CLASS_HID_6babc] = 2877,
+	[BNXT_ULP_CLASS_HID_6d5ac] = 2878,
+	[BNXT_ULP_CLASS_HID_6a078] = 2879,
+	[BNXT_ULP_CLASS_HID_6db68] = 2880,
+	[BNXT_ULP_CLASS_HID_68418] = 2881,
+	[BNXT_ULP_CLASS_HID_6bf08] = 2882,
+	[BNXT_ULP_CLASS_HID_68dd4] = 2883,
+	[BNXT_ULP_CLASS_HID_6a4c4] = 2884,
+	[BNXT_ULP_CLASS_HID_6ded0] = 2885,
+	[BNXT_ULP_CLASS_HID_69af4] = 2886,
+	[BNXT_ULP_CLASS_HID_6c48c] = 2887,
+	[BNXT_ULP_CLASS_HID_680b0] = 2888,
+	[BNXT_ULP_CLASS_HID_6a8ac] = 2889,
+	[BNXT_ULP_CLASS_HID_6c39c] = 2890,
+	[BNXT_ULP_CLASS_HID_6ae68] = 2891,
+	[BNXT_ULP_CLASS_HID_6c958] = 2892,
+	[BNXT_ULP_CLASS_HID_3c8b8] = 2893,
+	[BNXT_ULP_CLASS_HID_3845c] = 2894,
+	[BNXT_ULP_CLASS_HID_39328] = 2895,
+	[BNXT_ULP_CLASS_HID_38a18] = 2896,
+	[BNXT_ULP_CLASS_HID_3d214] = 2897,
+	[BNXT_ULP_CLASS_HID_3cd04] = 2898,
+	[BNXT_ULP_CLASS_HID_3dbd0] = 2899,
+	[BNXT_ULP_CLASS_HID_397f4] = 2900,
+	[BNXT_ULP_CLASS_HID_3b180] = 2901,
+	[BNXT_ULP_CLASS_HID_3a8f0] = 2902,
+	[BNXT_ULP_CLASS_HID_3b7bc] = 2903,
+	[BNXT_ULP_CLASS_HID_3aeac] = 2904,
+	[BNXT_ULP_CLASS_HID_39b5c] = 2905,
+	[BNXT_ULP_CLASS_HID_3b24c] = 2906,
+	[BNXT_ULP_CLASS_HID_38118] = 2907,
+	[BNXT_ULP_CLASS_HID_3b808] = 2908,
+	[BNXT_ULP_CLASS_HID_3d788] = 2909,
+	[BNXT_ULP_CLASS_HID_393ac] = 2910,
+	[BNXT_ULP_CLASS_HID_3dd44] = 2911,
+	[BNXT_ULP_CLASS_HID_39968] = 2912,
+	[BNXT_ULP_CLASS_HID_3a164] = 2913,
+	[BNXT_ULP_CLASS_HID_3d854] = 2914,
+	[BNXT_ULP_CLASS_HID_3a720] = 2915,
+	[BNXT_ULP_CLASS_HID_3de10] = 2916,
+	[BNXT_ULP_CLASS_HID_39cd0] = 2917,
+	[BNXT_ULP_CLASS_HID_3b7c0] = 2918,
+	[BNXT_ULP_CLASS_HID_3828c] = 2919,
+	[BNXT_ULP_CLASS_HID_3bdfc] = 2920,
+	[BNXT_ULP_CLASS_HID_3c5f8] = 2921,
+	[BNXT_ULP_CLASS_HID_3819c] = 2922,
+	[BNXT_ULP_CLASS_HID_3cbb4] = 2923,
+	[BNXT_ULP_CLASS_HID_38758] = 2924,
+	[BNXT_ULP_CLASS_HID_7c56c] = 2925,
+	[BNXT_ULP_CLASS_HID_78110] = 2926,
+	[BNXT_ULP_CLASS_HID_7cb28] = 2927,
+	[BNXT_ULP_CLASS_HID_786cc] = 2928,
+	[BNXT_ULP_CLASS_HID_7aec8] = 2929,
+	[BNXT_ULP_CLASS_HID_7c638] = 2930,
+	[BNXT_ULP_CLASS_HID_7d484] = 2931,
+	[BNXT_ULP_CLASS_HID_790a8] = 2932,
+	[BNXT_ULP_CLASS_HID_78ab4] = 2933,
+	[BNXT_ULP_CLASS_HID_7a5a4] = 2934,
+	[BNXT_ULP_CLASS_HID_7b070] = 2935,
+	[BNXT_ULP_CLASS_HID_7ab60] = 2936,
+	[BNXT_ULP_CLASS_HID_79410] = 2937,
+	[BNXT_ULP_CLASS_HID_78f00] = 2938,
+	[BNXT_ULP_CLASS_HID_79dcc] = 2939,
+	[BNXT_ULP_CLASS_HID_7b53c] = 2940,
+	[BNXT_ULP_CLASS_HID_7d0bc] = 2941,
+	[BNXT_ULP_CLASS_HID_7cbac] = 2942,
+	[BNXT_ULP_CLASS_HID_7d678] = 2943,
+	[BNXT_ULP_CLASS_HID_7921c] = 2944,
+	[BNXT_ULP_CLASS_HID_7ba18] = 2945,
+	[BNXT_ULP_CLASS_HID_7d508] = 2946,
+	[BNXT_ULP_CLASS_HID_7a3d4] = 2947,
+	[BNXT_ULP_CLASS_HID_7dac4] = 2948,
+	[BNXT_ULP_CLASS_HID_79984] = 2949,
+	[BNXT_ULP_CLASS_HID_7b0f4] = 2950,
+	[BNXT_ULP_CLASS_HID_79f40] = 2951,
+	[BNXT_ULP_CLASS_HID_7b6b0] = 2952,
+	[BNXT_ULP_CLASS_HID_7deac] = 2953,
+	[BNXT_ULP_CLASS_HID_79a50] = 2954,
+	[BNXT_ULP_CLASS_HID_7c468] = 2955,
+	[BNXT_ULP_CLASS_HID_7800c] = 2956,
+	[BNXT_ULP_CLASS_HID_86c0] = 2957,
+	[BNXT_ULP_CLASS_HID_a1d0] = 2958,
+	[BNXT_ULP_CLASS_HID_8c0c] = 2959,
+	[BNXT_ULP_CLASS_HID_a71c] = 2960,
+	[BNXT_ULP_CLASS_HID_906c] = 2961,
+	[BNXT_ULP_CLASS_HID_8b7c] = 2962,
+	[BNXT_ULP_CLASS_HID_99a8] = 2963,
+	[BNXT_ULP_CLASS_HID_b0b8] = 2964,
+	[BNXT_ULP_CLASS_HID_aab4] = 2965,
+	[BNXT_ULP_CLASS_HID_c244] = 2966,
+	[BNXT_ULP_CLASS_HID_d0f0] = 2967,
+	[BNXT_ULP_CLASS_HID_cb80] = 2968,
+	[BNXT_ULP_CLASS_HID_b4d0] = 2969,
+	[BNXT_ULP_CLASS_HID_afe0] = 2970,
+	[BNXT_ULP_CLASS_HID_ba1c] = 2971,
+	[BNXT_ULP_CLASS_HID_d52c] = 2972,
+	[BNXT_ULP_CLASS_HID_48314] = 2973,
+	[BNXT_ULP_CLASS_HID_4ba24] = 2974,
+	[BNXT_ULP_CLASS_HID_48950] = 2975,
+	[BNXT_ULP_CLASS_HID_4a060] = 2976,
+	[BNXT_ULP_CLASS_HID_4c86c] = 2977,
+	[BNXT_ULP_CLASS_HID_48440] = 2978,
+	[BNXT_ULP_CLASS_HID_492fc] = 2979,
+	[BNXT_ULP_CLASS_HID_48d8c] = 2980,
+	[BNXT_ULP_CLASS_HID_4a7f8] = 2981,
+	[BNXT_ULP_CLASS_HID_4de88] = 2982,
+	[BNXT_ULP_CLASS_HID_4adc4] = 2983,
+	[BNXT_ULP_CLASS_HID_4c4d4] = 2984,
+	[BNXT_ULP_CLASS_HID_4b124] = 2985,
+	[BNXT_ULP_CLASS_HID_4a834] = 2986,
+	[BNXT_ULP_CLASS_HID_4b760] = 2987,
+	[BNXT_ULP_CLASS_HID_4ae70] = 2988,
+	[BNXT_ULP_CLASS_HID_1bcc0] = 2989,
+	[BNXT_ULP_CLASS_HID_1d7d0] = 2990,
+	[BNXT_ULP_CLASS_HID_1a20c] = 2991,
+	[BNXT_ULP_CLASS_HID_1dd1c] = 2992,
+	[BNXT_ULP_CLASS_HID_1866c] = 2993,
+	[BNXT_ULP_CLASS_HID_1a17c] = 2994,
+	[BNXT_ULP_CLASS_HID_18fa8] = 2995,
+	[BNXT_ULP_CLASS_HID_1a6b8] = 2996,
+	[BNXT_ULP_CLASS_HID_1c0b4] = 2997,
+	[BNXT_ULP_CLASS_HID_19c88] = 2998,
+	[BNXT_ULP_CLASS_HID_1c6f0] = 2999,
+	[BNXT_ULP_CLASS_HID_182d4] = 3000,
+	[BNXT_ULP_CLASS_HID_1aad0] = 3001,
+	[BNXT_ULP_CLASS_HID_1c5e0] = 3002,
+	[BNXT_ULP_CLASS_HID_1d01c] = 3003,
+	[BNXT_ULP_CLASS_HID_1cb2c] = 3004,
+	[BNXT_ULP_CLASS_HID_5b914] = 3005,
+	[BNXT_ULP_CLASS_HID_5d024] = 3006,
+	[BNXT_ULP_CLASS_HID_5bf50] = 3007,
+	[BNXT_ULP_CLASS_HID_5d660] = 3008,
+	[BNXT_ULP_CLASS_HID_582b0] = 3009,
+	[BNXT_ULP_CLASS_HID_5ba40] = 3010,
+	[BNXT_ULP_CLASS_HID_588fc] = 3011,
+	[BNXT_ULP_CLASS_HID_5a38c] = 3012,
+	[BNXT_ULP_CLASS_HID_5ddf8] = 3013,
+	[BNXT_ULP_CLASS_HID_599dc] = 3014,
+	[BNXT_ULP_CLASS_HID_5c3c4] = 3015,
+	[BNXT_ULP_CLASS_HID_59f18] = 3016,
+	[BNXT_ULP_CLASS_HID_5a724] = 3017,
+	[BNXT_ULP_CLASS_HID_5de34] = 3018,
+	[BNXT_ULP_CLASS_HID_5ad60] = 3019,
+	[BNXT_ULP_CLASS_HID_5c470] = 3020,
+	[BNXT_ULP_CLASS_HID_cd40] = 3021,
+	[BNXT_ULP_CLASS_HID_e450] = 3022,
+	[BNXT_ULP_CLASS_HID_f28c] = 3023,
+	[BNXT_ULP_CLASS_HID_ed9c] = 3024,
+	[BNXT_ULP_CLASS_HID_d6ec] = 3025,
+	[BNXT_ULP_CLASS_HID_f1fc] = 3026,
+	[BNXT_ULP_CLASS_HID_dc28] = 3027,
+	[BNXT_ULP_CLASS_HID_f738] = 3028,
+	[BNXT_ULP_CLASS_HID_d134] = 3029,
+	[BNXT_ULP_CLASS_HID_c8c4] = 3030,
+	[BNXT_ULP_CLASS_HID_d770] = 3031,
+	[BNXT_ULP_CLASS_HID_d354] = 3032,
+	[BNXT_ULP_CLASS_HID_fb50] = 3033,
+	[BNXT_ULP_CLASS_HID_d260] = 3034,
+	[BNXT_ULP_CLASS_HID_e09c] = 3035,
+	[BNXT_ULP_CLASS_HID_dbac] = 3036,
+	[BNXT_ULP_CLASS_HID_4c994] = 3037,
+	[BNXT_ULP_CLASS_HID_4e0a4] = 3038,
+	[BNXT_ULP_CLASS_HID_4cfd0] = 3039,
+	[BNXT_ULP_CLASS_HID_4e6e0] = 3040,
+	[BNXT_ULP_CLASS_HID_4d330] = 3041,
+	[BNXT_ULP_CLASS_HID_4cac0] = 3042,
+	[BNXT_ULP_CLASS_HID_4d97c] = 3043,
+	[BNXT_ULP_CLASS_HID_4f00c] = 3044,
+	[BNXT_ULP_CLASS_HID_4ea78] = 3045,
+	[BNXT_ULP_CLASS_HID_4c508] = 3046,
+	[BNXT_ULP_CLASS_HID_4d044] = 3047,
+	[BNXT_ULP_CLASS_HID_4cb54] = 3048,
+	[BNXT_ULP_CLASS_HID_4f7a4] = 3049,
+	[BNXT_ULP_CLASS_HID_4eeb4] = 3050,
+	[BNXT_ULP_CLASS_HID_4fde0] = 3051,
+	[BNXT_ULP_CLASS_HID_4d4f0] = 3052,
+	[BNXT_ULP_CLASS_HID_1e340] = 3053,
+	[BNXT_ULP_CLASS_HID_1da50] = 3054,
+	[BNXT_ULP_CLASS_HID_1e88c] = 3055,
+	[BNXT_ULP_CLASS_HID_1c39c] = 3056,
+	[BNXT_ULP_CLASS_HID_1ccec] = 3057,
+	[BNXT_ULP_CLASS_HID_1e7fc] = 3058,
+	[BNXT_ULP_CLASS_HID_1f228] = 3059,
+	[BNXT_ULP_CLASS_HID_1ed38] = 3060,
+	[BNXT_ULP_CLASS_HID_1c734] = 3061,
+	[BNXT_ULP_CLASS_HID_1c308] = 3062,
+	[BNXT_ULP_CLASS_HID_1cd70] = 3063,
+	[BNXT_ULP_CLASS_HID_1c954] = 3064,
+	[BNXT_ULP_CLASS_HID_1d150] = 3065,
+	[BNXT_ULP_CLASS_HID_1c860] = 3066,
+	[BNXT_ULP_CLASS_HID_1d69c] = 3067,
+	[BNXT_ULP_CLASS_HID_1d2f0] = 3068,
+	[BNXT_ULP_CLASS_HID_5ff94] = 3069,
+	[BNXT_ULP_CLASS_HID_5d6a4] = 3070,
+	[BNXT_ULP_CLASS_HID_5e5d0] = 3071,
+	[BNXT_ULP_CLASS_HID_5dce0] = 3072,
+	[BNXT_ULP_CLASS_HID_5c930] = 3073,
+	[BNXT_ULP_CLASS_HID_5e0c0] = 3074,
+	[BNXT_ULP_CLASS_HID_5cf7c] = 3075,
+	[BNXT_ULP_CLASS_HID_5e60c] = 3076,
+	[BNXT_ULP_CLASS_HID_5c078] = 3077,
+	[BNXT_ULP_CLASS_HID_5dc5c] = 3078,
+	[BNXT_ULP_CLASS_HID_5c644] = 3079,
+	[BNXT_ULP_CLASS_HID_5c598] = 3080,
+	[BNXT_ULP_CLASS_HID_5eda4] = 3081,
+	[BNXT_ULP_CLASS_HID_5c4b4] = 3082,
+	[BNXT_ULP_CLASS_HID_5d3e0] = 3083,
+	[BNXT_ULP_CLASS_HID_5caf0] = 3084,
+	[BNXT_ULP_CLASS_HID_ab80] = 3085,
+	[BNXT_ULP_CLASS_HID_a290] = 3086,
+	[BNXT_ULP_CLASS_HID_b1cc] = 3087,
+	[BNXT_ULP_CLASS_HID_a8dc] = 3088,
+	[BNXT_ULP_CLASS_HID_b52c] = 3089,
+	[BNXT_ULP_CLASS_HID_ac3c] = 3090,
+	[BNXT_ULP_CLASS_HID_bb68] = 3091,
+	[BNXT_ULP_CLASS_HID_b278] = 3092,
+	[BNXT_ULP_CLASS_HID_ac74] = 3093,
+	[BNXT_ULP_CLASS_HID_e704] = 3094,
+	[BNXT_ULP_CLASS_HID_f5b0] = 3095,
+	[BNXT_ULP_CLASS_HID_b194] = 3096,
+	[BNXT_ULP_CLASS_HID_b990] = 3097,
+	[BNXT_ULP_CLASS_HID_f0a0] = 3098,
+	[BNXT_ULP_CLASS_HID_bfdc] = 3099,
+	[BNXT_ULP_CLASS_HID_f6ec] = 3100,
+	[BNXT_ULP_CLASS_HID_4a4d4] = 3101,
+	[BNXT_ULP_CLASS_HID_4bfe4] = 3102,
+	[BNXT_ULP_CLASS_HID_4aa10] = 3103,
+	[BNXT_ULP_CLASS_HID_4a520] = 3104,
+	[BNXT_ULP_CLASS_HID_4ed2c] = 3105,
+	[BNXT_ULP_CLASS_HID_4a900] = 3106,
+	[BNXT_ULP_CLASS_HID_4b7bc] = 3107,
+	[BNXT_ULP_CLASS_HID_4af4c] = 3108,
+	[BNXT_ULP_CLASS_HID_4a8b8] = 3109,
+	[BNXT_ULP_CLASS_HID_4e048] = 3110,
+	[BNXT_ULP_CLASS_HID_4ae84] = 3111,
+	[BNXT_ULP_CLASS_HID_4e994] = 3112,
+	[BNXT_ULP_CLASS_HID_4b2e4] = 3113,
+	[BNXT_ULP_CLASS_HID_4adf4] = 3114,
+	[BNXT_ULP_CLASS_HID_4b820] = 3115,
+	[BNXT_ULP_CLASS_HID_4f330] = 3116,
+	[BNXT_ULP_CLASS_HID_1a180] = 3117,
+	[BNXT_ULP_CLASS_HID_1f890] = 3118,
+	[BNXT_ULP_CLASS_HID_1a7cc] = 3119,
+	[BNXT_ULP_CLASS_HID_1fedc] = 3120,
+	[BNXT_ULP_CLASS_HID_1ab2c] = 3121,
+	[BNXT_ULP_CLASS_HID_1a23c] = 3122,
+	[BNXT_ULP_CLASS_HID_1b168] = 3123,
+	[BNXT_ULP_CLASS_HID_1a878] = 3124,
+	[BNXT_ULP_CLASS_HID_1e274] = 3125,
+	[BNXT_ULP_CLASS_HID_1be48] = 3126,
+	[BNXT_ULP_CLASS_HID_1ebb0] = 3127,
+	[BNXT_ULP_CLASS_HID_1a794] = 3128,
+	[BNXT_ULP_CLASS_HID_1af90] = 3129,
+	[BNXT_ULP_CLASS_HID_1e6a0] = 3130,
+	[BNXT_ULP_CLASS_HID_1f5dc] = 3131,
+	[BNXT_ULP_CLASS_HID_1b130] = 3132,
+	[BNXT_ULP_CLASS_HID_5bad4] = 3133,
+	[BNXT_ULP_CLASS_HID_5f5e4] = 3134,
+	[BNXT_ULP_CLASS_HID_5a010] = 3135,
+	[BNXT_ULP_CLASS_HID_5fb20] = 3136,
+	[BNXT_ULP_CLASS_HID_5a470] = 3137,
+	[BNXT_ULP_CLASS_HID_5bf00] = 3138,
+	[BNXT_ULP_CLASS_HID_5adbc] = 3139,
+	[BNXT_ULP_CLASS_HID_5a54c] = 3140,
+	[BNXT_ULP_CLASS_HID_5feb8] = 3141,
+	[BNXT_ULP_CLASS_HID_5ba9c] = 3142,
+	[BNXT_ULP_CLASS_HID_5e484] = 3143,
+	[BNXT_ULP_CLASS_HID_5a0d8] = 3144,
+	[BNXT_ULP_CLASS_HID_5a8e4] = 3145,
+	[BNXT_ULP_CLASS_HID_5e3f4] = 3146,
+	[BNXT_ULP_CLASS_HID_5ae20] = 3147,
+	[BNXT_ULP_CLASS_HID_5e930] = 3148,
+	[BNXT_ULP_CLASS_HID_ee00] = 3149,
+	[BNXT_ULP_CLASS_HID_e910] = 3150,
+	[BNXT_ULP_CLASS_HID_f44c] = 3151,
+	[BNXT_ULP_CLASS_HID_ef5c] = 3152,
+	[BNXT_ULP_CLASS_HID_fbac] = 3153,
+	[BNXT_ULP_CLASS_HID_f2bc] = 3154,
+	[BNXT_ULP_CLASS_HID_e1e8] = 3155,
+	[BNXT_ULP_CLASS_HID_f8f8] = 3156,
+	[BNXT_ULP_CLASS_HID_f2f4] = 3157,
+	[BNXT_ULP_CLASS_HID_ed84] = 3158,
+	[BNXT_ULP_CLASS_HID_f830] = 3159,
+	[BNXT_ULP_CLASS_HID_f414] = 3160,
+	[BNXT_ULP_CLASS_HID_fc10] = 3161,
+	[BNXT_ULP_CLASS_HID_f720] = 3162,
+	[BNXT_ULP_CLASS_HID_e25c] = 3163,
+	[BNXT_ULP_CLASS_HID_fd6c] = 3164,
+	[BNXT_ULP_CLASS_HID_4eb54] = 3165,
+	[BNXT_ULP_CLASS_HID_4e264] = 3166,
+	[BNXT_ULP_CLASS_HID_4f090] = 3167,
+	[BNXT_ULP_CLASS_HID_4eba0] = 3168,
+	[BNXT_ULP_CLASS_HID_4f4f0] = 3169,
+	[BNXT_ULP_CLASS_HID_4ef80] = 3170,
+	[BNXT_ULP_CLASS_HID_4fa3c] = 3171,
+	[BNXT_ULP_CLASS_HID_4f5cc] = 3172,
+	[BNXT_ULP_CLASS_HID_4ef38] = 3173,
+	[BNXT_ULP_CLASS_HID_4e6c8] = 3174,
+	[BNXT_ULP_CLASS_HID_4f504] = 3175,
+	[BNXT_ULP_CLASS_HID_4f158] = 3176,
+	[BNXT_ULP_CLASS_HID_4f964] = 3177,
+	[BNXT_ULP_CLASS_HID_4f074] = 3178,
+	[BNXT_ULP_CLASS_HID_4fea0] = 3179,
+	[BNXT_ULP_CLASS_HID_4f9b0] = 3180,
+	[BNXT_ULP_CLASS_HID_1e400] = 3181,
+	[BNXT_ULP_CLASS_HID_1ff10] = 3182,
+	[BNXT_ULP_CLASS_HID_1ea4c] = 3183,
+	[BNXT_ULP_CLASS_HID_1e55c] = 3184,
+	[BNXT_ULP_CLASS_HID_1f1ac] = 3185,
+	[BNXT_ULP_CLASS_HID_1e8bc] = 3186,
+	[BNXT_ULP_CLASS_HID_1f7e8] = 3187,
+	[BNXT_ULP_CLASS_HID_1eef8] = 3188,
+	[BNXT_ULP_CLASS_HID_1e8f4] = 3189,
+	[BNXT_ULP_CLASS_HID_1e4c8] = 3190,
+	[BNXT_ULP_CLASS_HID_1f304] = 3191,
+	[BNXT_ULP_CLASS_HID_1ea14] = 3192,
+	[BNXT_ULP_CLASS_HID_1f210] = 3193,
+	[BNXT_ULP_CLASS_HID_1ed20] = 3194,
+	[BNXT_ULP_CLASS_HID_1f85c] = 3195,
+	[BNXT_ULP_CLASS_HID_1f7b0] = 3196,
+	[BNXT_ULP_CLASS_HID_5e154] = 3197,
+	[BNXT_ULP_CLASS_HID_5f864] = 3198,
+	[BNXT_ULP_CLASS_HID_5e690] = 3199,
+	[BNXT_ULP_CLASS_HID_5e1a0] = 3200,
+	[BNXT_ULP_CLASS_HID_5eaf0] = 3201,
+	[BNXT_ULP_CLASS_HID_5e580] = 3202,
+	[BNXT_ULP_CLASS_HID_5f03c] = 3203,
+	[BNXT_ULP_CLASS_HID_5ebcc] = 3204,
+	[BNXT_ULP_CLASS_HID_5e538] = 3205,
+	[BNXT_ULP_CLASS_HID_5e11c] = 3206,
+	[BNXT_ULP_CLASS_HID_5eb04] = 3207,
+	[BNXT_ULP_CLASS_HID_5e758] = 3208,
+	[BNXT_ULP_CLASS_HID_5ef64] = 3209,
+	[BNXT_ULP_CLASS_HID_5e674] = 3210,
+	[BNXT_ULP_CLASS_HID_5f4a0] = 3211,
+	[BNXT_ULP_CLASS_HID_5f084] = 3212,
+	[BNXT_ULP_CLASS_HID_22998] = 3213,
+	[BNXT_ULP_CLASS_HID_24088] = 3214,
+	[BNXT_ULP_CLASS_HID_22f54] = 3215,
+	[BNXT_ULP_CLASS_HID_24644] = 3216,
+	[BNXT_ULP_CLASS_HID_23334] = 3217,
+	[BNXT_ULP_CLASS_HID_22a24] = 3218,
+	[BNXT_ULP_CLASS_HID_238f0] = 3219,
+	[BNXT_ULP_CLASS_HID_253e0] = 3220,
+	[BNXT_ULP_CLASS_HID_24dec] = 3221,
+	[BNXT_ULP_CLASS_HID_209d0] = 3222,
+	[BNXT_ULP_CLASS_HID_2149c] = 3223,
+	[BNXT_ULP_CLASS_HID_20f8c] = 3224,
+	[BNXT_ULP_CLASS_HID_25788] = 3225,
+	[BNXT_ULP_CLASS_HID_2136c] = 3226,
+	[BNXT_ULP_CLASS_HID_25d44] = 3227,
+	[BNXT_ULP_CLASS_HID_21928] = 3228,
+	[BNXT_ULP_CLASS_HID_234a8] = 3229,
+	[BNXT_ULP_CLASS_HID_22fd8] = 3230,
+	[BNXT_ULP_CLASS_HID_23a64] = 3231,
+	[BNXT_ULP_CLASS_HID_25594] = 3232,
+	[BNXT_ULP_CLASS_HID_21e44] = 3233,
+	[BNXT_ULP_CLASS_HID_23974] = 3234,
+	[BNXT_ULP_CLASS_HID_20400] = 3235,
+	[BNXT_ULP_CLASS_HID_23f30] = 3236,
+	[BNXT_ULP_CLASS_HID_2593c] = 3237,
+	[BNXT_ULP_CLASS_HID_214e0] = 3238,
+	[BNXT_ULP_CLASS_HID_25ef8] = 3239,
+	[BNXT_ULP_CLASS_HID_21adc] = 3240,
+	[BNXT_ULP_CLASS_HID_222d8] = 3241,
+	[BNXT_ULP_CLASS_HID_25dc8] = 3242,
+	[BNXT_ULP_CLASS_HID_22894] = 3243,
+	[BNXT_ULP_CLASS_HID_24384] = 3244,
+	[BNXT_ULP_CLASS_HID_6224c] = 3245,
+	[BNXT_ULP_CLASS_HID_65d7c] = 3246,
+	[BNXT_ULP_CLASS_HID_62808] = 3247,
+	[BNXT_ULP_CLASS_HID_64338] = 3248,
+	[BNXT_ULP_CLASS_HID_60fe8] = 3249,
+	[BNXT_ULP_CLASS_HID_62718] = 3250,
+	[BNXT_ULP_CLASS_HID_635a4] = 3251,
+	[BNXT_ULP_CLASS_HID_62cd4] = 3252,
+	[BNXT_ULP_CLASS_HID_646a0] = 3253,
+	[BNXT_ULP_CLASS_HID_60284] = 3254,
+	[BNXT_ULP_CLASS_HID_61150] = 3255,
+	[BNXT_ULP_CLASS_HID_60840] = 3256,
+	[BNXT_ULP_CLASS_HID_6507c] = 3257,
+	[BNXT_ULP_CLASS_HID_64b6c] = 3258,
+	[BNXT_ULP_CLASS_HID_65638] = 3259,
+	[BNXT_ULP_CLASS_HID_6121c] = 3260,
+	[BNXT_ULP_CLASS_HID_6319c] = 3261,
+	[BNXT_ULP_CLASS_HID_6288c] = 3262,
+	[BNXT_ULP_CLASS_HID_63758] = 3263,
+	[BNXT_ULP_CLASS_HID_62e48] = 3264,
+	[BNXT_ULP_CLASS_HID_61b38] = 3265,
+	[BNXT_ULP_CLASS_HID_63228] = 3266,
+	[BNXT_ULP_CLASS_HID_600f4] = 3267,
+	[BNXT_ULP_CLASS_HID_63be4] = 3268,
+	[BNXT_ULP_CLASS_HID_655f0] = 3269,
+	[BNXT_ULP_CLASS_HID_611d4] = 3270,
+	[BNXT_ULP_CLASS_HID_65bac] = 3271,
+	[BNXT_ULP_CLASS_HID_61790] = 3272,
+	[BNXT_ULP_CLASS_HID_63f8c] = 3273,
+	[BNXT_ULP_CLASS_HID_656bc] = 3274,
+	[BNXT_ULP_CLASS_HID_62548] = 3275,
+	[BNXT_ULP_CLASS_HID_65c78] = 3276,
+	[BNXT_ULP_CLASS_HID_35f98] = 3277,
+	[BNXT_ULP_CLASS_HID_31b7c] = 3278,
+	[BNXT_ULP_CLASS_HID_34554] = 3279,
+	[BNXT_ULP_CLASS_HID_30138] = 3280,
+	[BNXT_ULP_CLASS_HID_32934] = 3281,
+	[BNXT_ULP_CLASS_HID_34024] = 3282,
+	[BNXT_ULP_CLASS_HID_32ef0] = 3283,
+	[BNXT_ULP_CLASS_HID_349e0] = 3284,
+	[BNXT_ULP_CLASS_HID_304a0] = 3285,
+	[BNXT_ULP_CLASS_HID_33fd0] = 3286,
+	[BNXT_ULP_CLASS_HID_30a9c] = 3287,
+	[BNXT_ULP_CLASS_HID_3258c] = 3288,
+	[BNXT_ULP_CLASS_HID_34d88] = 3289,
+	[BNXT_ULP_CLASS_HID_3096c] = 3290,
+	[BNXT_ULP_CLASS_HID_31438] = 3291,
+	[BNXT_ULP_CLASS_HID_30f28] = 3292,
+	[BNXT_ULP_CLASS_HID_32aa8] = 3293,
+	[BNXT_ULP_CLASS_HID_345d8] = 3294,
+	[BNXT_ULP_CLASS_HID_35064] = 3295,
+	[BNXT_ULP_CLASS_HID_34b94] = 3296,
+	[BNXT_ULP_CLASS_HID_33444] = 3297,
+	[BNXT_ULP_CLASS_HID_32f74] = 3298,
+	[BNXT_ULP_CLASS_HID_33a00] = 3299,
+	[BNXT_ULP_CLASS_HID_35530] = 3300,
+	[BNXT_ULP_CLASS_HID_313f0] = 3301,
+	[BNXT_ULP_CLASS_HID_30ae0] = 3302,
+	[BNXT_ULP_CLASS_HID_319ac] = 3303,
+	[BNXT_ULP_CLASS_HID_330dc] = 3304,
+	[BNXT_ULP_CLASS_HID_358d8] = 3305,
+	[BNXT_ULP_CLASS_HID_314bc] = 3306,
+	[BNXT_ULP_CLASS_HID_35e94] = 3307,
+	[BNXT_ULP_CLASS_HID_31a78] = 3308,
+	[BNXT_ULP_CLASS_HID_7584c] = 3309,
+	[BNXT_ULP_CLASS_HID_71430] = 3310,
+	[BNXT_ULP_CLASS_HID_75e08] = 3311,
+	[BNXT_ULP_CLASS_HID_71dec] = 3312,
+	[BNXT_ULP_CLASS_HID_725e8] = 3313,
+	[BNXT_ULP_CLASS_HID_75d18] = 3314,
+	[BNXT_ULP_CLASS_HID_72ba4] = 3315,
+	[BNXT_ULP_CLASS_HID_742d4] = 3316,
+	[BNXT_ULP_CLASS_HID_70194] = 3317,
+	[BNXT_ULP_CLASS_HID_73884] = 3318,
+	[BNXT_ULP_CLASS_HID_70750] = 3319,
+	[BNXT_ULP_CLASS_HID_73e40] = 3320,
+	[BNXT_ULP_CLASS_HID_7467c] = 3321,
+	[BNXT_ULP_CLASS_HID_70220] = 3322,
+	[BNXT_ULP_CLASS_HID_710ec] = 3323,
+	[BNXT_ULP_CLASS_HID_7081c] = 3324,
+	[BNXT_ULP_CLASS_HID_7279c] = 3325,
+	[BNXT_ULP_CLASS_HID_75e8c] = 3326,
+	[BNXT_ULP_CLASS_HID_72d58] = 3327,
+	[BNXT_ULP_CLASS_HID_74448] = 3328,
+	[BNXT_ULP_CLASS_HID_73138] = 3329,
+	[BNXT_ULP_CLASS_HID_72828] = 3330,
+	[BNXT_ULP_CLASS_HID_736f4] = 3331,
+	[BNXT_ULP_CLASS_HID_751e4] = 3332,
+	[BNXT_ULP_CLASS_HID_74bf0] = 3333,
+	[BNXT_ULP_CLASS_HID_707d4] = 3334,
+	[BNXT_ULP_CLASS_HID_71260] = 3335,
+	[BNXT_ULP_CLASS_HID_70d90] = 3336,
+	[BNXT_ULP_CLASS_HID_7558c] = 3337,
+	[BNXT_ULP_CLASS_HID_71170] = 3338,
+	[BNXT_ULP_CLASS_HID_75b48] = 3339,
+	[BNXT_ULP_CLASS_HID_7172c] = 3340,
+	[BNXT_ULP_CLASS_HID_2d298] = 3341,
+	[BNXT_ULP_CLASS_HID_2cd88] = 3342,
+	[BNXT_ULP_CLASS_HID_2d854] = 3343,
+	[BNXT_ULP_CLASS_HID_29438] = 3344,
+	[BNXT_ULP_CLASS_HID_2bc34] = 3345,
+	[BNXT_ULP_CLASS_HID_2d724] = 3346,
+	[BNXT_ULP_CLASS_HID_2a5f0] = 3347,
+	[BNXT_ULP_CLASS_HID_2dce0] = 3348,
+	[BNXT_ULP_CLASS_HID_29ba0] = 3349,
+	[BNXT_ULP_CLASS_HID_2b2d0] = 3350,
+	[BNXT_ULP_CLASS_HID_2819c] = 3351,
+	[BNXT_ULP_CLASS_HID_2b88c] = 3352,
+	[BNXT_ULP_CLASS_HID_2c088] = 3353,
+	[BNXT_ULP_CLASS_HID_29c6c] = 3354,
+	[BNXT_ULP_CLASS_HID_2c644] = 3355,
+	[BNXT_ULP_CLASS_HID_28228] = 3356,
+	[BNXT_ULP_CLASS_HID_2a1a8] = 3357,
+	[BNXT_ULP_CLASS_HID_2d8d8] = 3358,
+	[BNXT_ULP_CLASS_HID_2a764] = 3359,
+	[BNXT_ULP_CLASS_HID_2de94] = 3360,
+	[BNXT_ULP_CLASS_HID_28b44] = 3361,
+	[BNXT_ULP_CLASS_HID_2a274] = 3362,
+	[BNXT_ULP_CLASS_HID_2b100] = 3363,
+	[BNXT_ULP_CLASS_HID_2a830] = 3364,
+	[BNXT_ULP_CLASS_HID_2c23c] = 3365,
+	[BNXT_ULP_CLASS_HID_281e0] = 3366,
+	[BNXT_ULP_CLASS_HID_2cbf8] = 3367,
+	[BNXT_ULP_CLASS_HID_287dc] = 3368,
+	[BNXT_ULP_CLASS_HID_2afd8] = 3369,
+	[BNXT_ULP_CLASS_HID_2c6c8] = 3370,
+	[BNXT_ULP_CLASS_HID_2d594] = 3371,
+	[BNXT_ULP_CLASS_HID_29178] = 3372,
+	[BNXT_ULP_CLASS_HID_6af4c] = 3373,
+	[BNXT_ULP_CLASS_HID_6c67c] = 3374,
+	[BNXT_ULP_CLASS_HID_6d508] = 3375,
+	[BNXT_ULP_CLASS_HID_690ec] = 3376,
+	[BNXT_ULP_CLASS_HID_6b8e8] = 3377,
+	[BNXT_ULP_CLASS_HID_6d018] = 3378,
+	[BNXT_ULP_CLASS_HID_6bea4] = 3379,
+	[BNXT_ULP_CLASS_HID_6d9d4] = 3380,
+	[BNXT_ULP_CLASS_HID_69494] = 3381,
+	[BNXT_ULP_CLASS_HID_68f84] = 3382,
+	[BNXT_ULP_CLASS_HID_69a50] = 3383,
+	[BNXT_ULP_CLASS_HID_6b540] = 3384,
+	[BNXT_ULP_CLASS_HID_6dd7c] = 3385,
+	[BNXT_ULP_CLASS_HID_69920] = 3386,
+	[BNXT_ULP_CLASS_HID_6c338] = 3387,
+	[BNXT_ULP_CLASS_HID_69f1c] = 3388,
+	[BNXT_ULP_CLASS_HID_6ba9c] = 3389,
+	[BNXT_ULP_CLASS_HID_6d58c] = 3390,
+	[BNXT_ULP_CLASS_HID_6a058] = 3391,
+	[BNXT_ULP_CLASS_HID_6db48] = 3392,
+	[BNXT_ULP_CLASS_HID_68438] = 3393,
+	[BNXT_ULP_CLASS_HID_6bf28] = 3394,
+	[BNXT_ULP_CLASS_HID_68df4] = 3395,
+	[BNXT_ULP_CLASS_HID_6a4e4] = 3396,
+	[BNXT_ULP_CLASS_HID_6def0] = 3397,
+	[BNXT_ULP_CLASS_HID_69ad4] = 3398,
+	[BNXT_ULP_CLASS_HID_6c4ac] = 3399,
+	[BNXT_ULP_CLASS_HID_68090] = 3400,
+	[BNXT_ULP_CLASS_HID_6a88c] = 3401,
+	[BNXT_ULP_CLASS_HID_6c3bc] = 3402,
+	[BNXT_ULP_CLASS_HID_6ae48] = 3403,
+	[BNXT_ULP_CLASS_HID_6c978] = 3404,
+	[BNXT_ULP_CLASS_HID_3c898] = 3405,
+	[BNXT_ULP_CLASS_HID_3847c] = 3406,
+	[BNXT_ULP_CLASS_HID_39308] = 3407,
+	[BNXT_ULP_CLASS_HID_38a38] = 3408,
+	[BNXT_ULP_CLASS_HID_3d234] = 3409,
+	[BNXT_ULP_CLASS_HID_3cd24] = 3410,
+	[BNXT_ULP_CLASS_HID_3dbf0] = 3411,
+	[BNXT_ULP_CLASS_HID_397d4] = 3412,
+	[BNXT_ULP_CLASS_HID_3b1a0] = 3413,
+	[BNXT_ULP_CLASS_HID_3a8d0] = 3414,
+	[BNXT_ULP_CLASS_HID_3b79c] = 3415,
+	[BNXT_ULP_CLASS_HID_3ae8c] = 3416,
+	[BNXT_ULP_CLASS_HID_39b7c] = 3417,
+	[BNXT_ULP_CLASS_HID_3b26c] = 3418,
+	[BNXT_ULP_CLASS_HID_38138] = 3419,
+	[BNXT_ULP_CLASS_HID_3b828] = 3420,
+	[BNXT_ULP_CLASS_HID_3d7a8] = 3421,
+	[BNXT_ULP_CLASS_HID_3938c] = 3422,
+	[BNXT_ULP_CLASS_HID_3dd64] = 3423,
+	[BNXT_ULP_CLASS_HID_39948] = 3424,
+	[BNXT_ULP_CLASS_HID_3a144] = 3425,
+	[BNXT_ULP_CLASS_HID_3d874] = 3426,
+	[BNXT_ULP_CLASS_HID_3a700] = 3427,
+	[BNXT_ULP_CLASS_HID_3de30] = 3428,
+	[BNXT_ULP_CLASS_HID_39cf0] = 3429,
+	[BNXT_ULP_CLASS_HID_3b7e0] = 3430,
+	[BNXT_ULP_CLASS_HID_382ac] = 3431,
+	[BNXT_ULP_CLASS_HID_3bddc] = 3432,
+	[BNXT_ULP_CLASS_HID_3c5d8] = 3433,
+	[BNXT_ULP_CLASS_HID_381bc] = 3434,
+	[BNXT_ULP_CLASS_HID_3cb94] = 3435,
+	[BNXT_ULP_CLASS_HID_38778] = 3436,
+	[BNXT_ULP_CLASS_HID_7c54c] = 3437,
+	[BNXT_ULP_CLASS_HID_78130] = 3438,
+	[BNXT_ULP_CLASS_HID_7cb08] = 3439,
+	[BNXT_ULP_CLASS_HID_786ec] = 3440,
+	[BNXT_ULP_CLASS_HID_7aee8] = 3441,
+	[BNXT_ULP_CLASS_HID_7c618] = 3442,
+	[BNXT_ULP_CLASS_HID_7d4a4] = 3443,
+	[BNXT_ULP_CLASS_HID_79088] = 3444,
+	[BNXT_ULP_CLASS_HID_78a94] = 3445,
+	[BNXT_ULP_CLASS_HID_7a584] = 3446,
+	[BNXT_ULP_CLASS_HID_7b050] = 3447,
+	[BNXT_ULP_CLASS_HID_7ab40] = 3448,
+	[BNXT_ULP_CLASS_HID_79430] = 3449,
+	[BNXT_ULP_CLASS_HID_78f20] = 3450,
+	[BNXT_ULP_CLASS_HID_79dec] = 3451,
+	[BNXT_ULP_CLASS_HID_7b51c] = 3452,
+	[BNXT_ULP_CLASS_HID_7d09c] = 3453,
+	[BNXT_ULP_CLASS_HID_7cb8c] = 3454,
+	[BNXT_ULP_CLASS_HID_7d658] = 3455,
+	[BNXT_ULP_CLASS_HID_7923c] = 3456,
+	[BNXT_ULP_CLASS_HID_7ba38] = 3457,
+	[BNXT_ULP_CLASS_HID_7d528] = 3458,
+	[BNXT_ULP_CLASS_HID_7a3f4] = 3459,
+	[BNXT_ULP_CLASS_HID_7dae4] = 3460,
+	[BNXT_ULP_CLASS_HID_799a4] = 3461,
+	[BNXT_ULP_CLASS_HID_7b0d4] = 3462,
+	[BNXT_ULP_CLASS_HID_79f60] = 3463,
+	[BNXT_ULP_CLASS_HID_7b690] = 3464,
+	[BNXT_ULP_CLASS_HID_7de8c] = 3465,
+	[BNXT_ULP_CLASS_HID_79a70] = 3466,
+	[BNXT_ULP_CLASS_HID_7c448] = 3467,
+	[BNXT_ULP_CLASS_HID_7802c] = 3468,
+	[BNXT_ULP_CLASS_HID_86a0] = 3469,
+	[BNXT_ULP_CLASS_HID_a1b0] = 3470,
+	[BNXT_ULP_CLASS_HID_8c6c] = 3471,
+	[BNXT_ULP_CLASS_HID_a77c] = 3472,
+	[BNXT_ULP_CLASS_HID_900c] = 3473,
+	[BNXT_ULP_CLASS_HID_8b1c] = 3474,
+	[BNXT_ULP_CLASS_HID_99c8] = 3475,
+	[BNXT_ULP_CLASS_HID_b0d8] = 3476,
+	[BNXT_ULP_CLASS_HID_aad4] = 3477,
+	[BNXT_ULP_CLASS_HID_c224] = 3478,
+	[BNXT_ULP_CLASS_HID_d090] = 3479,
+	[BNXT_ULP_CLASS_HID_cbe0] = 3480,
+	[BNXT_ULP_CLASS_HID_b4b0] = 3481,
+	[BNXT_ULP_CLASS_HID_af80] = 3482,
+	[BNXT_ULP_CLASS_HID_ba7c] = 3483,
+	[BNXT_ULP_CLASS_HID_d54c] = 3484,
+	[BNXT_ULP_CLASS_HID_48374] = 3485,
+	[BNXT_ULP_CLASS_HID_4ba44] = 3486,
+	[BNXT_ULP_CLASS_HID_48930] = 3487,
+	[BNXT_ULP_CLASS_HID_4a000] = 3488,
+	[BNXT_ULP_CLASS_HID_4c80c] = 3489,
+	[BNXT_ULP_CLASS_HID_48420] = 3490,
+	[BNXT_ULP_CLASS_HID_4929c] = 3491,
+	[BNXT_ULP_CLASS_HID_48dec] = 3492,
+	[BNXT_ULP_CLASS_HID_4a798] = 3493,
+	[BNXT_ULP_CLASS_HID_4dee8] = 3494,
+	[BNXT_ULP_CLASS_HID_4ada4] = 3495,
+	[BNXT_ULP_CLASS_HID_4c4b4] = 3496,
+	[BNXT_ULP_CLASS_HID_4b144] = 3497,
+	[BNXT_ULP_CLASS_HID_4a854] = 3498,
+	[BNXT_ULP_CLASS_HID_4b700] = 3499,
+	[BNXT_ULP_CLASS_HID_4ae10] = 3500,
+	[BNXT_ULP_CLASS_HID_1bca0] = 3501,
+	[BNXT_ULP_CLASS_HID_1d7b0] = 3502,
+	[BNXT_ULP_CLASS_HID_1a26c] = 3503,
+	[BNXT_ULP_CLASS_HID_1dd7c] = 3504,
+	[BNXT_ULP_CLASS_HID_1860c] = 3505,
+	[BNXT_ULP_CLASS_HID_1a11c] = 3506,
+	[BNXT_ULP_CLASS_HID_18fc8] = 3507,
+	[BNXT_ULP_CLASS_HID_1a6d8] = 3508,
+	[BNXT_ULP_CLASS_HID_1c0d4] = 3509,
+	[BNXT_ULP_CLASS_HID_19ce8] = 3510,
+	[BNXT_ULP_CLASS_HID_1c690] = 3511,
+	[BNXT_ULP_CLASS_HID_182b4] = 3512,
+	[BNXT_ULP_CLASS_HID_1aab0] = 3513,
+	[BNXT_ULP_CLASS_HID_1c580] = 3514,
+	[BNXT_ULP_CLASS_HID_1d07c] = 3515,
+	[BNXT_ULP_CLASS_HID_1cb4c] = 3516,
+	[BNXT_ULP_CLASS_HID_5b974] = 3517,
+	[BNXT_ULP_CLASS_HID_5d044] = 3518,
+	[BNXT_ULP_CLASS_HID_5bf30] = 3519,
+	[BNXT_ULP_CLASS_HID_5d600] = 3520,
+	[BNXT_ULP_CLASS_HID_582d0] = 3521,
+	[BNXT_ULP_CLASS_HID_5ba20] = 3522,
+	[BNXT_ULP_CLASS_HID_5889c] = 3523,
+	[BNXT_ULP_CLASS_HID_5a3ec] = 3524,
+	[BNXT_ULP_CLASS_HID_5dd98] = 3525,
+	[BNXT_ULP_CLASS_HID_599bc] = 3526,
+	[BNXT_ULP_CLASS_HID_5c3a4] = 3527,
+	[BNXT_ULP_CLASS_HID_59f78] = 3528,
+	[BNXT_ULP_CLASS_HID_5a744] = 3529,
+	[BNXT_ULP_CLASS_HID_5de54] = 3530,
+	[BNXT_ULP_CLASS_HID_5ad00] = 3531,
+	[BNXT_ULP_CLASS_HID_5c410] = 3532,
+	[BNXT_ULP_CLASS_HID_cd20] = 3533,
+	[BNXT_ULP_CLASS_HID_e430] = 3534,
+	[BNXT_ULP_CLASS_HID_f2ec] = 3535,
+	[BNXT_ULP_CLASS_HID_edfc] = 3536,
+	[BNXT_ULP_CLASS_HID_d68c] = 3537,
+	[BNXT_ULP_CLASS_HID_f19c] = 3538,
+	[BNXT_ULP_CLASS_HID_dc48] = 3539,
+	[BNXT_ULP_CLASS_HID_f758] = 3540,
+	[BNXT_ULP_CLASS_HID_d154] = 3541,
+	[BNXT_ULP_CLASS_HID_c8a4] = 3542,
+	[BNXT_ULP_CLASS_HID_d710] = 3543,
+	[BNXT_ULP_CLASS_HID_d334] = 3544,
+	[BNXT_ULP_CLASS_HID_fb30] = 3545,
+	[BNXT_ULP_CLASS_HID_d200] = 3546,
+	[BNXT_ULP_CLASS_HID_e0fc] = 3547,
+	[BNXT_ULP_CLASS_HID_dbcc] = 3548,
+	[BNXT_ULP_CLASS_HID_4c9f4] = 3549,
+	[BNXT_ULP_CLASS_HID_4e0c4] = 3550,
+	[BNXT_ULP_CLASS_HID_4cfb0] = 3551,
+	[BNXT_ULP_CLASS_HID_4e680] = 3552,
+	[BNXT_ULP_CLASS_HID_4d350] = 3553,
+	[BNXT_ULP_CLASS_HID_4caa0] = 3554,
+	[BNXT_ULP_CLASS_HID_4d91c] = 3555,
+	[BNXT_ULP_CLASS_HID_4f06c] = 3556,
+	[BNXT_ULP_CLASS_HID_4ea18] = 3557,
+	[BNXT_ULP_CLASS_HID_4c568] = 3558,
+	[BNXT_ULP_CLASS_HID_4d024] = 3559,
+	[BNXT_ULP_CLASS_HID_4cb34] = 3560,
+	[BNXT_ULP_CLASS_HID_4f7c4] = 3561,
+	[BNXT_ULP_CLASS_HID_4eed4] = 3562,
+	[BNXT_ULP_CLASS_HID_4fd80] = 3563,
+	[BNXT_ULP_CLASS_HID_4d490] = 3564,
+	[BNXT_ULP_CLASS_HID_1e320] = 3565,
+	[BNXT_ULP_CLASS_HID_1da30] = 3566,
+	[BNXT_ULP_CLASS_HID_1e8ec] = 3567,
+	[BNXT_ULP_CLASS_HID_1c3fc] = 3568,
+	[BNXT_ULP_CLASS_HID_1cc8c] = 3569,
+	[BNXT_ULP_CLASS_HID_1e79c] = 3570,
+	[BNXT_ULP_CLASS_HID_1f248] = 3571,
+	[BNXT_ULP_CLASS_HID_1ed58] = 3572,
+	[BNXT_ULP_CLASS_HID_1c754] = 3573,
+	[BNXT_ULP_CLASS_HID_1c368] = 3574,
+	[BNXT_ULP_CLASS_HID_1cd10] = 3575,
+	[BNXT_ULP_CLASS_HID_1c934] = 3576,
+	[BNXT_ULP_CLASS_HID_1d130] = 3577,
+	[BNXT_ULP_CLASS_HID_1c800] = 3578,
+	[BNXT_ULP_CLASS_HID_1d6fc] = 3579,
+	[BNXT_ULP_CLASS_HID_1d290] = 3580,
+	[BNXT_ULP_CLASS_HID_5fff4] = 3581,
+	[BNXT_ULP_CLASS_HID_5d6c4] = 3582,
+	[BNXT_ULP_CLASS_HID_5e5b0] = 3583,
+	[BNXT_ULP_CLASS_HID_5dc80] = 3584,
+	[BNXT_ULP_CLASS_HID_5c950] = 3585,
+	[BNXT_ULP_CLASS_HID_5e0a0] = 3586,
+	[BNXT_ULP_CLASS_HID_5cf1c] = 3587,
+	[BNXT_ULP_CLASS_HID_5e66c] = 3588,
+	[BNXT_ULP_CLASS_HID_5c018] = 3589,
+	[BNXT_ULP_CLASS_HID_5dc3c] = 3590,
+	[BNXT_ULP_CLASS_HID_5c624] = 3591,
+	[BNXT_ULP_CLASS_HID_5c5f8] = 3592,
+	[BNXT_ULP_CLASS_HID_5edc4] = 3593,
+	[BNXT_ULP_CLASS_HID_5c4d4] = 3594,
+	[BNXT_ULP_CLASS_HID_5d380] = 3595,
+	[BNXT_ULP_CLASS_HID_5ca90] = 3596,
+	[BNXT_ULP_CLASS_HID_abe0] = 3597,
+	[BNXT_ULP_CLASS_HID_a2f0] = 3598,
+	[BNXT_ULP_CLASS_HID_b1ac] = 3599,
+	[BNXT_ULP_CLASS_HID_a8bc] = 3600,
+	[BNXT_ULP_CLASS_HID_b54c] = 3601,
+	[BNXT_ULP_CLASS_HID_ac5c] = 3602,
+	[BNXT_ULP_CLASS_HID_bb08] = 3603,
+	[BNXT_ULP_CLASS_HID_b218] = 3604,
+	[BNXT_ULP_CLASS_HID_ac14] = 3605,
+	[BNXT_ULP_CLASS_HID_e764] = 3606,
+	[BNXT_ULP_CLASS_HID_f5d0] = 3607,
+	[BNXT_ULP_CLASS_HID_b1f4] = 3608,
+	[BNXT_ULP_CLASS_HID_b9f0] = 3609,
+	[BNXT_ULP_CLASS_HID_f0c0] = 3610,
+	[BNXT_ULP_CLASS_HID_bfbc] = 3611,
+	[BNXT_ULP_CLASS_HID_f68c] = 3612,
+	[BNXT_ULP_CLASS_HID_4a4b4] = 3613,
+	[BNXT_ULP_CLASS_HID_4bf84] = 3614,
+	[BNXT_ULP_CLASS_HID_4aa70] = 3615,
+	[BNXT_ULP_CLASS_HID_4a540] = 3616,
+	[BNXT_ULP_CLASS_HID_4ed4c] = 3617,
+	[BNXT_ULP_CLASS_HID_4a960] = 3618,
+	[BNXT_ULP_CLASS_HID_4b7dc] = 3619,
+	[BNXT_ULP_CLASS_HID_4af2c] = 3620,
+	[BNXT_ULP_CLASS_HID_4a8d8] = 3621,
+	[BNXT_ULP_CLASS_HID_4e028] = 3622,
+	[BNXT_ULP_CLASS_HID_4aee4] = 3623,
+	[BNXT_ULP_CLASS_HID_4e9f4] = 3624,
+	[BNXT_ULP_CLASS_HID_4b284] = 3625,
+	[BNXT_ULP_CLASS_HID_4ad94] = 3626,
+	[BNXT_ULP_CLASS_HID_4b840] = 3627,
+	[BNXT_ULP_CLASS_HID_4f350] = 3628,
+	[BNXT_ULP_CLASS_HID_1a1e0] = 3629,
+	[BNXT_ULP_CLASS_HID_1f8f0] = 3630,
+	[BNXT_ULP_CLASS_HID_1a7ac] = 3631,
+	[BNXT_ULP_CLASS_HID_1febc] = 3632,
+	[BNXT_ULP_CLASS_HID_1ab4c] = 3633,
+	[BNXT_ULP_CLASS_HID_1a25c] = 3634,
+	[BNXT_ULP_CLASS_HID_1b108] = 3635,
+	[BNXT_ULP_CLASS_HID_1a818] = 3636,
+	[BNXT_ULP_CLASS_HID_1e214] = 3637,
+	[BNXT_ULP_CLASS_HID_1be28] = 3638,
+	[BNXT_ULP_CLASS_HID_1ebd0] = 3639,
+	[BNXT_ULP_CLASS_HID_1a7f4] = 3640,
+	[BNXT_ULP_CLASS_HID_1aff0] = 3641,
+	[BNXT_ULP_CLASS_HID_1e6c0] = 3642,
+	[BNXT_ULP_CLASS_HID_1f5bc] = 3643,
+	[BNXT_ULP_CLASS_HID_1b150] = 3644,
+	[BNXT_ULP_CLASS_HID_5bab4] = 3645,
+	[BNXT_ULP_CLASS_HID_5f584] = 3646,
+	[BNXT_ULP_CLASS_HID_5a070] = 3647,
+	[BNXT_ULP_CLASS_HID_5fb40] = 3648,
+	[BNXT_ULP_CLASS_HID_5a410] = 3649,
+	[BNXT_ULP_CLASS_HID_5bf60] = 3650,
+	[BNXT_ULP_CLASS_HID_5addc] = 3651,
+	[BNXT_ULP_CLASS_HID_5a52c] = 3652,
+	[BNXT_ULP_CLASS_HID_5fed8] = 3653,
+	[BNXT_ULP_CLASS_HID_5bafc] = 3654,
+	[BNXT_ULP_CLASS_HID_5e4e4] = 3655,
+	[BNXT_ULP_CLASS_HID_5a0b8] = 3656,
+	[BNXT_ULP_CLASS_HID_5a884] = 3657,
+	[BNXT_ULP_CLASS_HID_5e394] = 3658,
+	[BNXT_ULP_CLASS_HID_5ae40] = 3659,
+	[BNXT_ULP_CLASS_HID_5e950] = 3660,
+	[BNXT_ULP_CLASS_HID_ee60] = 3661,
+	[BNXT_ULP_CLASS_HID_e970] = 3662,
+	[BNXT_ULP_CLASS_HID_f42c] = 3663,
+	[BNXT_ULP_CLASS_HID_ef3c] = 3664,
+	[BNXT_ULP_CLASS_HID_fbcc] = 3665,
+	[BNXT_ULP_CLASS_HID_f2dc] = 3666,
+	[BNXT_ULP_CLASS_HID_e188] = 3667,
+	[BNXT_ULP_CLASS_HID_f898] = 3668,
+	[BNXT_ULP_CLASS_HID_f294] = 3669,
+	[BNXT_ULP_CLASS_HID_ede4] = 3670,
+	[BNXT_ULP_CLASS_HID_f850] = 3671,
+	[BNXT_ULP_CLASS_HID_f474] = 3672,
+	[BNXT_ULP_CLASS_HID_fc70] = 3673,
+	[BNXT_ULP_CLASS_HID_f740] = 3674,
+	[BNXT_ULP_CLASS_HID_e23c] = 3675,
+	[BNXT_ULP_CLASS_HID_fd0c] = 3676,
+	[BNXT_ULP_CLASS_HID_4eb34] = 3677,
+	[BNXT_ULP_CLASS_HID_4e204] = 3678,
+	[BNXT_ULP_CLASS_HID_4f0f0] = 3679,
+	[BNXT_ULP_CLASS_HID_4ebc0] = 3680,
+	[BNXT_ULP_CLASS_HID_4f490] = 3681,
+	[BNXT_ULP_CLASS_HID_4efe0] = 3682,
+	[BNXT_ULP_CLASS_HID_4fa5c] = 3683,
+	[BNXT_ULP_CLASS_HID_4f5ac] = 3684,
+	[BNXT_ULP_CLASS_HID_4ef58] = 3685,
+	[BNXT_ULP_CLASS_HID_4e6a8] = 3686,
+	[BNXT_ULP_CLASS_HID_4f564] = 3687,
+	[BNXT_ULP_CLASS_HID_4f138] = 3688,
+	[BNXT_ULP_CLASS_HID_4f904] = 3689,
+	[BNXT_ULP_CLASS_HID_4f014] = 3690,
+	[BNXT_ULP_CLASS_HID_4fec0] = 3691,
+	[BNXT_ULP_CLASS_HID_4f9d0] = 3692,
+	[BNXT_ULP_CLASS_HID_1e460] = 3693,
+	[BNXT_ULP_CLASS_HID_1ff70] = 3694,
+	[BNXT_ULP_CLASS_HID_1ea2c] = 3695,
+	[BNXT_ULP_CLASS_HID_1e53c] = 3696,
+	[BNXT_ULP_CLASS_HID_1f1cc] = 3697,
+	[BNXT_ULP_CLASS_HID_1e8dc] = 3698,
+	[BNXT_ULP_CLASS_HID_1f788] = 3699,
+	[BNXT_ULP_CLASS_HID_1ee98] = 3700,
+	[BNXT_ULP_CLASS_HID_1e894] = 3701,
+	[BNXT_ULP_CLASS_HID_1e4a8] = 3702,
+	[BNXT_ULP_CLASS_HID_1f364] = 3703,
+	[BNXT_ULP_CLASS_HID_1ea74] = 3704,
+	[BNXT_ULP_CLASS_HID_1f270] = 3705,
+	[BNXT_ULP_CLASS_HID_1ed40] = 3706,
+	[BNXT_ULP_CLASS_HID_1f83c] = 3707,
+	[BNXT_ULP_CLASS_HID_1f7d0] = 3708,
+	[BNXT_ULP_CLASS_HID_5e134] = 3709,
+	[BNXT_ULP_CLASS_HID_5f804] = 3710,
+	[BNXT_ULP_CLASS_HID_5e6f0] = 3711,
+	[BNXT_ULP_CLASS_HID_5e1c0] = 3712,
+	[BNXT_ULP_CLASS_HID_5ea90] = 3713,
+	[BNXT_ULP_CLASS_HID_5e5e0] = 3714,
+	[BNXT_ULP_CLASS_HID_5f05c] = 3715,
+	[BNXT_ULP_CLASS_HID_5ebac] = 3716,
+	[BNXT_ULP_CLASS_HID_5e558] = 3717,
+	[BNXT_ULP_CLASS_HID_5e17c] = 3718,
+	[BNXT_ULP_CLASS_HID_5eb64] = 3719,
+	[BNXT_ULP_CLASS_HID_5e738] = 3720,
+	[BNXT_ULP_CLASS_HID_5ef04] = 3721,
+	[BNXT_ULP_CLASS_HID_5e614] = 3722,
+	[BNXT_ULP_CLASS_HID_5f4c0] = 3723,
+	[BNXT_ULP_CLASS_HID_5f0e4] = 3724,
+	[BNXT_ULP_CLASS_HID_5802] = 3725,
+	[BNXT_ULP_CLASS_HID_5e46] = 3726,
+	[BNXT_ULP_CLASS_HID_1d76] = 3727,
+	[BNXT_ULP_CLASS_HID_02ba] = 3728,
+	[BNXT_ULP_CLASS_HID_32a2] = 3729,
+	[BNXT_ULP_CLASS_HID_38e6] = 3730,
+	[BNXT_ULP_CLASS_HID_52ca] = 3731,
+	[BNXT_ULP_CLASS_HID_580e] = 3732,
+	[BNXT_ULP_CLASS_HID_44996] = 3733,
+	[BNXT_ULP_CLASS_HID_410e6] = 3734,
+	[BNXT_ULP_CLASS_HID_42036] = 3735,
+	[BNXT_ULP_CLASS_HID_4264a] = 3736,
+	[BNXT_ULP_CLASS_HID_45ffe] = 3737,
+	[BNXT_ULP_CLASS_HID_44532] = 3738,
+	[BNXT_ULP_CLASS_HID_4399e] = 3739,
+	[BNXT_ULP_CLASS_HID_43fd2] = 3740,
+	[BNXT_ULP_CLASS_HID_23da0] = 3741,
+	[BNXT_ULP_CLASS_HID_2239c] = 3742,
+	[BNXT_ULP_CLASS_HID_207fc] = 3743,
+	[BNXT_ULP_CLASS_HID_20d38] = 3744,
+	[BNXT_ULP_CLASS_HID_25e34] = 3745,
+	[BNXT_ULP_CLASS_HID_24470] = 3746,
+	[BNXT_ULP_CLASS_HID_22850] = 3747,
+	[BNXT_ULP_CLASS_HID_2518c] = 3748,
+	[BNXT_ULP_CLASS_HID_20970] = 3749,
+	[BNXT_ULP_CLASS_HID_20eac] = 3750,
+	[BNXT_ULP_CLASS_HID_2128c] = 3751,
+	[BNXT_ULP_CLASS_HID_218c8] = 3752,
+	[BNXT_ULP_CLASS_HID_22dc4] = 3753,
+	[BNXT_ULP_CLASS_HID_25300] = 3754,
+	[BNXT_ULP_CLASS_HID_23760] = 3755,
+	[BNXT_ULP_CLASS_HID_23d5c] = 3756,
+	[BNXT_ULP_CLASS_HID_63694] = 3757,
+	[BNXT_ULP_CLASS_HID_63cd0] = 3758,
+	[BNXT_ULP_CLASS_HID_60030] = 3759,
+	[BNXT_ULP_CLASS_HID_6066c] = 3760,
+	[BNXT_ULP_CLASS_HID_65b68] = 3761,
+	[BNXT_ULP_CLASS_HID_640a4] = 3762,
+	[BNXT_ULP_CLASS_HID_62484] = 3763,
+	[BNXT_ULP_CLASS_HID_62ac0] = 3764,
+	[BNXT_ULP_CLASS_HID_605a4] = 3765,
+	[BNXT_ULP_CLASS_HID_60be0] = 3766,
+	[BNXT_ULP_CLASS_HID_64a8c] = 3767,
+	[BNXT_ULP_CLASS_HID_6153c] = 3768,
+	[BNXT_ULP_CLASS_HID_62638] = 3769,
+	[BNXT_ULP_CLASS_HID_62c74] = 3770,
+	[BNXT_ULP_CLASS_HID_63054] = 3771,
+	[BNXT_ULP_CLASS_HID_63990] = 3772,
+	[BNXT_ULP_CLASS_HID_9a98] = 3773,
+	[BNXT_ULP_CLASS_HID_80a4] = 3774,
+	[BNXT_ULP_CLASS_HID_c3b0] = 3775,
+	[BNXT_ULP_CLASS_HID_c9fc] = 3776,
+	[BNXT_ULP_CLASS_HID_bf0c] = 3777,
+	[BNXT_ULP_CLASS_HID_a548] = 3778,
+	[BNXT_ULP_CLASS_HID_8968] = 3779,
+	[BNXT_ULP_CLASS_HID_8eb4] = 3780,
+	[BNXT_ULP_CLASS_HID_497ac] = 3781,
+	[BNXT_ULP_CLASS_HID_49de8] = 3782,
+	[BNXT_ULP_CLASS_HID_4dcc4] = 3783,
+	[BNXT_ULP_CLASS_HID_4c200] = 3784,
+	[BNXT_ULP_CLASS_HID_4b850] = 3785,
+	[BNXT_ULP_CLASS_HID_4a19c] = 3786,
+	[BNXT_ULP_CLASS_HID_485bc] = 3787,
+	[BNXT_ULP_CLASS_HID_48bf8] = 3788,
+	[BNXT_ULP_CLASS_HID_1b098] = 3789,
+	[BNXT_ULP_CLASS_HID_1b6a4] = 3790,
+	[BNXT_ULP_CLASS_HID_19ac4] = 3791,
+	[BNXT_ULP_CLASS_HID_18000] = 3792,
+	[BNXT_ULP_CLASS_HID_1d50c] = 3793,
+	[BNXT_ULP_CLASS_HID_1db48] = 3794,
+	[BNXT_ULP_CLASS_HID_1bf68] = 3795,
+	[BNXT_ULP_CLASS_HID_1a4b4] = 3796,
+	[BNXT_ULP_CLASS_HID_58dac] = 3797,
+	[BNXT_ULP_CLASS_HID_5b3e8] = 3798,
+	[BNXT_ULP_CLASS_HID_59708] = 3799,
+	[BNXT_ULP_CLASS_HID_59d54] = 3800,
+	[BNXT_ULP_CLASS_HID_5ae50] = 3801,
+	[BNXT_ULP_CLASS_HID_5d79c] = 3802,
+	[BNXT_ULP_CLASS_HID_5bbbc] = 3803,
+	[BNXT_ULP_CLASS_HID_5a1f8] = 3804,
+	[BNXT_ULP_CLASS_HID_5822] = 3805,
+	[BNXT_ULP_CLASS_HID_5e66] = 3806,
+	[BNXT_ULP_CLASS_HID_1d56] = 3807,
+	[BNXT_ULP_CLASS_HID_029a] = 3808,
+	[BNXT_ULP_CLASS_HID_3282] = 3809,
+	[BNXT_ULP_CLASS_HID_38c6] = 3810,
+	[BNXT_ULP_CLASS_HID_52ea] = 3811,
+	[BNXT_ULP_CLASS_HID_582e] = 3812,
+	[BNXT_ULP_CLASS_HID_51ba] = 3813,
+	[BNXT_ULP_CLASS_HID_57fe] = 3814,
+	[BNXT_ULP_CLASS_HID_12ee] = 3815,
+	[BNXT_ULP_CLASS_HID_1832] = 3816,
+	[BNXT_ULP_CLASS_HID_081a] = 3817,
+	[BNXT_ULP_CLASS_HID_0e5e] = 3818,
+	[BNXT_ULP_CLASS_HID_2802] = 3819,
+	[BNXT_ULP_CLASS_HID_2e46] = 3820,
+	[BNXT_ULP_CLASS_HID_4556e] = 3821,
+	[BNXT_ULP_CLASS_HID_45ab2] = 3822,
+	[BNXT_ULP_CLASS_HID_419a2] = 3823,
+	[BNXT_ULP_CLASS_HID_41fe6] = 3824,
+	[BNXT_ULP_CLASS_HID_40fce] = 3825,
+	[BNXT_ULP_CLASS_HID_43512] = 3826,
+	[BNXT_ULP_CLASS_HID_42f36] = 3827,
+	[BNXT_ULP_CLASS_HID_4557a] = 3828,
+	[BNXT_ULP_CLASS_HID_42a86] = 3829,
+	[BNXT_ULP_CLASS_HID_450ca] = 3830,
+	[BNXT_ULP_CLASS_HID_44aee] = 3831,
+	[BNXT_ULP_CLASS_HID_4157e] = 3832,
+	[BNXT_ULP_CLASS_HID_40566] = 3833,
+	[BNXT_ULP_CLASS_HID_40aaa] = 3834,
+	[BNXT_ULP_CLASS_HID_4254e] = 3835,
+	[BNXT_ULP_CLASS_HID_42a92] = 3836,
+	[BNXT_ULP_CLASS_HID_449b6] = 3837,
+	[BNXT_ULP_CLASS_HID_410c6] = 3838,
+	[BNXT_ULP_CLASS_HID_42016] = 3839,
+	[BNXT_ULP_CLASS_HID_4266a] = 3840,
+	[BNXT_ULP_CLASS_HID_45fde] = 3841,
+	[BNXT_ULP_CLASS_HID_44512] = 3842,
+	[BNXT_ULP_CLASS_HID_439be] = 3843,
+	[BNXT_ULP_CLASS_HID_43ff2] = 3844,
+	[BNXT_ULP_CLASS_HID_63682] = 3845,
+	[BNXT_ULP_CLASS_HID_63cc6] = 3846,
+	[BNXT_ULP_CLASS_HID_61162] = 3847,
+	[BNXT_ULP_CLASS_HID_616a6] = 3848,
+	[BNXT_ULP_CLASS_HID_60c2a] = 3849,
+	[BNXT_ULP_CLASS_HID_6326e] = 3850,
+	[BNXT_ULP_CLASS_HID_645be] = 3851,
+	[BNXT_ULP_CLASS_HID_64bf2] = 3852,
+	[BNXT_ULP_CLASS_HID_50082] = 3853,
+	[BNXT_ULP_CLASS_HID_506c6] = 3854,
+	[BNXT_ULP_CLASS_HID_55616] = 3855,
+	[BNXT_ULP_CLASS_HID_55c6a] = 3856,
+	[BNXT_ULP_CLASS_HID_5162a] = 3857,
+	[BNXT_ULP_CLASS_HID_51c6e] = 3858,
+	[BNXT_ULP_CLASS_HID_52fbe] = 3859,
+	[BNXT_ULP_CLASS_HID_555f2] = 3860,
+	[BNXT_ULP_CLASS_HID_72c82] = 3861,
+	[BNXT_ULP_CLASS_HID_752c6] = 3862,
+	[BNXT_ULP_CLASS_HID_70762] = 3863,
+	[BNXT_ULP_CLASS_HID_70ca6] = 3864,
+	[BNXT_ULP_CLASS_HID_7222a] = 3865,
+	[BNXT_ULP_CLASS_HID_7286e] = 3866,
+	[BNXT_ULP_CLASS_HID_71c8a] = 3867,
+	[BNXT_ULP_CLASS_HID_702ce] = 3868,
+	[BNXT_ULP_CLASS_HID_5842] = 3869,
+	[BNXT_ULP_CLASS_HID_5e06] = 3870,
+	[BNXT_ULP_CLASS_HID_1d36] = 3871,
+	[BNXT_ULP_CLASS_HID_02fa] = 3872,
+	[BNXT_ULP_CLASS_HID_32e2] = 3873,
+	[BNXT_ULP_CLASS_HID_38a6] = 3874,
+	[BNXT_ULP_CLASS_HID_528a] = 3875,
+	[BNXT_ULP_CLASS_HID_584e] = 3876,
+	[BNXT_ULP_CLASS_HID_51da] = 3877,
+	[BNXT_ULP_CLASS_HID_579e] = 3878,
+	[BNXT_ULP_CLASS_HID_128e] = 3879,
+	[BNXT_ULP_CLASS_HID_1852] = 3880,
+	[BNXT_ULP_CLASS_HID_087a] = 3881,
+	[BNXT_ULP_CLASS_HID_0e3e] = 3882,
+	[BNXT_ULP_CLASS_HID_2862] = 3883,
+	[BNXT_ULP_CLASS_HID_2e26] = 3884,
+	[BNXT_ULP_CLASS_HID_4550e] = 3885,
+	[BNXT_ULP_CLASS_HID_45ad2] = 3886,
+	[BNXT_ULP_CLASS_HID_419c2] = 3887,
+	[BNXT_ULP_CLASS_HID_41f86] = 3888,
+	[BNXT_ULP_CLASS_HID_40fae] = 3889,
+	[BNXT_ULP_CLASS_HID_43572] = 3890,
+	[BNXT_ULP_CLASS_HID_42f56] = 3891,
+	[BNXT_ULP_CLASS_HID_4551a] = 3892,
+	[BNXT_ULP_CLASS_HID_42ae6] = 3893,
+	[BNXT_ULP_CLASS_HID_450aa] = 3894,
+	[BNXT_ULP_CLASS_HID_44a8e] = 3895,
+	[BNXT_ULP_CLASS_HID_4151e] = 3896,
+	[BNXT_ULP_CLASS_HID_40506] = 3897,
+	[BNXT_ULP_CLASS_HID_40aca] = 3898,
+	[BNXT_ULP_CLASS_HID_4252e] = 3899,
+	[BNXT_ULP_CLASS_HID_42af2] = 3900,
+	[BNXT_ULP_CLASS_HID_449d6] = 3901,
+	[BNXT_ULP_CLASS_HID_410a6] = 3902,
+	[BNXT_ULP_CLASS_HID_42076] = 3903,
+	[BNXT_ULP_CLASS_HID_4260a] = 3904,
+	[BNXT_ULP_CLASS_HID_45fbe] = 3905,
+	[BNXT_ULP_CLASS_HID_44572] = 3906,
+	[BNXT_ULP_CLASS_HID_439de] = 3907,
+	[BNXT_ULP_CLASS_HID_43f92] = 3908,
+	[BNXT_ULP_CLASS_HID_636e2] = 3909,
+	[BNXT_ULP_CLASS_HID_63ca6] = 3910,
+	[BNXT_ULP_CLASS_HID_61102] = 3911,
+	[BNXT_ULP_CLASS_HID_616c6] = 3912,
+	[BNXT_ULP_CLASS_HID_60c4a] = 3913,
+	[BNXT_ULP_CLASS_HID_6320e] = 3914,
+	[BNXT_ULP_CLASS_HID_645de] = 3915,
+	[BNXT_ULP_CLASS_HID_64b92] = 3916,
+	[BNXT_ULP_CLASS_HID_500e2] = 3917,
+	[BNXT_ULP_CLASS_HID_506a6] = 3918,
+	[BNXT_ULP_CLASS_HID_55676] = 3919,
+	[BNXT_ULP_CLASS_HID_55c0a] = 3920,
+	[BNXT_ULP_CLASS_HID_5164a] = 3921,
+	[BNXT_ULP_CLASS_HID_51c0e] = 3922,
+	[BNXT_ULP_CLASS_HID_52fde] = 3923,
+	[BNXT_ULP_CLASS_HID_55592] = 3924,
+	[BNXT_ULP_CLASS_HID_72ce2] = 3925,
+	[BNXT_ULP_CLASS_HID_752a6] = 3926,
+	[BNXT_ULP_CLASS_HID_70702] = 3927,
+	[BNXT_ULP_CLASS_HID_70cc6] = 3928,
+	[BNXT_ULP_CLASS_HID_7224a] = 3929,
+	[BNXT_ULP_CLASS_HID_7280e] = 3930,
+	[BNXT_ULP_CLASS_HID_71cea] = 3931,
+	[BNXT_ULP_CLASS_HID_702ae] = 3932,
+	[BNXT_ULP_CLASS_HID_23dc0] = 3933,
+	[BNXT_ULP_CLASS_HID_223fc] = 3934,
+	[BNXT_ULP_CLASS_HID_2079c] = 3935,
+	[BNXT_ULP_CLASS_HID_20d58] = 3936,
+	[BNXT_ULP_CLASS_HID_25e54] = 3937,
+	[BNXT_ULP_CLASS_HID_24410] = 3938,
+	[BNXT_ULP_CLASS_HID_22830] = 3939,
+	[BNXT_ULP_CLASS_HID_251ec] = 3940,
+	[BNXT_ULP_CLASS_HID_20910] = 3941,
+	[BNXT_ULP_CLASS_HID_20ecc] = 3942,
+	[BNXT_ULP_CLASS_HID_212ec] = 3943,
+	[BNXT_ULP_CLASS_HID_218a8] = 3944,
+	[BNXT_ULP_CLASS_HID_22da4] = 3945,
+	[BNXT_ULP_CLASS_HID_25360] = 3946,
+	[BNXT_ULP_CLASS_HID_23700] = 3947,
+	[BNXT_ULP_CLASS_HID_23d3c] = 3948,
+	[BNXT_ULP_CLASS_HID_636f4] = 3949,
+	[BNXT_ULP_CLASS_HID_63cb0] = 3950,
+	[BNXT_ULP_CLASS_HID_60050] = 3951,
+	[BNXT_ULP_CLASS_HID_6060c] = 3952,
+	[BNXT_ULP_CLASS_HID_65b08] = 3953,
+	[BNXT_ULP_CLASS_HID_640c4] = 3954,
+	[BNXT_ULP_CLASS_HID_624e4] = 3955,
+	[BNXT_ULP_CLASS_HID_62aa0] = 3956,
+	[BNXT_ULP_CLASS_HID_605c4] = 3957,
+	[BNXT_ULP_CLASS_HID_60b80] = 3958,
+	[BNXT_ULP_CLASS_HID_64aec] = 3959,
+	[BNXT_ULP_CLASS_HID_6155c] = 3960,
+	[BNXT_ULP_CLASS_HID_62658] = 3961,
+	[BNXT_ULP_CLASS_HID_62c14] = 3962,
+	[BNXT_ULP_CLASS_HID_63034] = 3963,
+	[BNXT_ULP_CLASS_HID_639f0] = 3964,
+	[BNXT_ULP_CLASS_HID_353c0] = 3965,
+	[BNXT_ULP_CLASS_HID_359fc] = 3966,
+	[BNXT_ULP_CLASS_HID_33d9c] = 3967,
+	[BNXT_ULP_CLASS_HID_32358] = 3968,
+	[BNXT_ULP_CLASS_HID_31908] = 3969,
+	[BNXT_ULP_CLASS_HID_31ec4] = 3970,
+	[BNXT_ULP_CLASS_HID_35e30] = 3971,
+	[BNXT_ULP_CLASS_HID_347ec] = 3972,
+	[BNXT_ULP_CLASS_HID_33f10] = 3973,
+	[BNXT_ULP_CLASS_HID_324cc] = 3974,
+	[BNXT_ULP_CLASS_HID_308ec] = 3975,
+	[BNXT_ULP_CLASS_HID_30ea8] = 3976,
+	[BNXT_ULP_CLASS_HID_343a4] = 3977,
+	[BNXT_ULP_CLASS_HID_34960] = 3978,
+	[BNXT_ULP_CLASS_HID_32d00] = 3979,
+	[BNXT_ULP_CLASS_HID_3533c] = 3980,
+	[BNXT_ULP_CLASS_HID_72cf4] = 3981,
+	[BNXT_ULP_CLASS_HID_752b0] = 3982,
+	[BNXT_ULP_CLASS_HID_73650] = 3983,
+	[BNXT_ULP_CLASS_HID_73c0c] = 3984,
+	[BNXT_ULP_CLASS_HID_7123c] = 3985,
+	[BNXT_ULP_CLASS_HID_71bf8] = 3986,
+	[BNXT_ULP_CLASS_HID_75ae4] = 3987,
+	[BNXT_ULP_CLASS_HID_740a0] = 3988,
+	[BNXT_ULP_CLASS_HID_73bc4] = 3989,
+	[BNXT_ULP_CLASS_HID_72180] = 3990,
+	[BNXT_ULP_CLASS_HID_705a0] = 3991,
+	[BNXT_ULP_CLASS_HID_70b5c] = 3992,
+	[BNXT_ULP_CLASS_HID_75c58] = 3993,
+	[BNXT_ULP_CLASS_HID_74214] = 3994,
+	[BNXT_ULP_CLASS_HID_72634] = 3995,
+	[BNXT_ULP_CLASS_HID_72ff0] = 3996,
+	[BNXT_ULP_CLASS_HID_2a6c0] = 3997,
+	[BNXT_ULP_CLASS_HID_2acfc] = 3998,
+	[BNXT_ULP_CLASS_HID_2b09c] = 3999,
+	[BNXT_ULP_CLASS_HID_2b658] = 4000,
+	[BNXT_ULP_CLASS_HID_2cb54] = 4001,
+	[BNXT_ULP_CLASS_HID_295c4] = 4002,
+	[BNXT_ULP_CLASS_HID_2d530] = 4003,
+	[BNXT_ULP_CLASS_HID_2daec] = 4004,
+	[BNXT_ULP_CLASS_HID_2b210] = 4005,
+	[BNXT_ULP_CLASS_HID_2bbcc] = 4006,
+	[BNXT_ULP_CLASS_HID_29fec] = 4007,
+	[BNXT_ULP_CLASS_HID_285a8] = 4008,
+	[BNXT_ULP_CLASS_HID_2d6a4] = 4009,
+	[BNXT_ULP_CLASS_HID_2dc60] = 4010,
+	[BNXT_ULP_CLASS_HID_2a000] = 4011,
+	[BNXT_ULP_CLASS_HID_2a63c] = 4012,
+	[BNXT_ULP_CLASS_HID_6a3f4] = 4013,
+	[BNXT_ULP_CLASS_HID_6a9b0] = 4014,
+	[BNXT_ULP_CLASS_HID_68d50] = 4015,
+	[BNXT_ULP_CLASS_HID_6b30c] = 4016,
+	[BNXT_ULP_CLASS_HID_6c408] = 4017,
+	[BNXT_ULP_CLASS_HID_6cdc4] = 4018,
+	[BNXT_ULP_CLASS_HID_6d1e4] = 4019,
+	[BNXT_ULP_CLASS_HID_6d7a0] = 4020,
+	[BNXT_ULP_CLASS_HID_68ec4] = 4021,
+	[BNXT_ULP_CLASS_HID_6b480] = 4022,
+	[BNXT_ULP_CLASS_HID_698a0] = 4023,
+	[BNXT_ULP_CLASS_HID_69e5c] = 4024,
+	[BNXT_ULP_CLASS_HID_6d358] = 4025,
+	[BNXT_ULP_CLASS_HID_6d914] = 4026,
+	[BNXT_ULP_CLASS_HID_6bd34] = 4027,
+	[BNXT_ULP_CLASS_HID_6a2f0] = 4028,
+	[BNXT_ULP_CLASS_HID_3dcc0] = 4029,
+	[BNXT_ULP_CLASS_HID_3c2fc] = 4030,
+	[BNXT_ULP_CLASS_HID_3a69c] = 4031,
+	[BNXT_ULP_CLASS_HID_3ac58] = 4032,
+	[BNXT_ULP_CLASS_HID_38208] = 4033,
+	[BNXT_ULP_CLASS_HID_38bc4] = 4034,
+	[BNXT_ULP_CLASS_HID_3cb30] = 4035,
+	[BNXT_ULP_CLASS_HID_395a0] = 4036,
+	[BNXT_ULP_CLASS_HID_3a810] = 4037,
+	[BNXT_ULP_CLASS_HID_3d1cc] = 4038,
+	[BNXT_ULP_CLASS_HID_3b5ec] = 4039,
+	[BNXT_ULP_CLASS_HID_3bba8] = 4040,
+	[BNXT_ULP_CLASS_HID_39158] = 4041,
+	[BNXT_ULP_CLASS_HID_39714] = 4042,
+	[BNXT_ULP_CLASS_HID_3d600] = 4043,
+	[BNXT_ULP_CLASS_HID_3dc3c] = 4044,
+	[BNXT_ULP_CLASS_HID_7d9f4] = 4045,
+	[BNXT_ULP_CLASS_HID_7dfb0] = 4046,
+	[BNXT_ULP_CLASS_HID_7a350] = 4047,
+	[BNXT_ULP_CLASS_HID_7a90c] = 4048,
+	[BNXT_ULP_CLASS_HID_79f3c] = 4049,
+	[BNXT_ULP_CLASS_HID_784f8] = 4050,
+	[BNXT_ULP_CLASS_HID_7c7e4] = 4051,
+	[BNXT_ULP_CLASS_HID_7cda0] = 4052,
+	[BNXT_ULP_CLASS_HID_7a4c4] = 4053,
+	[BNXT_ULP_CLASS_HID_7aa80] = 4054,
+	[BNXT_ULP_CLASS_HID_78ea0] = 4055,
+	[BNXT_ULP_CLASS_HID_7b45c] = 4056,
+	[BNXT_ULP_CLASS_HID_7c958] = 4057,
+	[BNXT_ULP_CLASS_HID_793c8] = 4058,
+	[BNXT_ULP_CLASS_HID_7d334] = 4059,
+	[BNXT_ULP_CLASS_HID_7d8f0] = 4060,
+	[BNXT_ULP_CLASS_HID_9ab8] = 4061,
+	[BNXT_ULP_CLASS_HID_8084] = 4062,
+	[BNXT_ULP_CLASS_HID_c390] = 4063,
+	[BNXT_ULP_CLASS_HID_c9dc] = 4064,
+	[BNXT_ULP_CLASS_HID_bf2c] = 4065,
+	[BNXT_ULP_CLASS_HID_a568] = 4066,
+	[BNXT_ULP_CLASS_HID_8948] = 4067,
+	[BNXT_ULP_CLASS_HID_8e94] = 4068,
+	[BNXT_ULP_CLASS_HID_4978c] = 4069,
+	[BNXT_ULP_CLASS_HID_49dc8] = 4070,
+	[BNXT_ULP_CLASS_HID_4dce4] = 4071,
+	[BNXT_ULP_CLASS_HID_4c220] = 4072,
+	[BNXT_ULP_CLASS_HID_4b870] = 4073,
+	[BNXT_ULP_CLASS_HID_4a1bc] = 4074,
+	[BNXT_ULP_CLASS_HID_4859c] = 4075,
+	[BNXT_ULP_CLASS_HID_48bd8] = 4076,
+	[BNXT_ULP_CLASS_HID_1b0b8] = 4077,
+	[BNXT_ULP_CLASS_HID_1b684] = 4078,
+	[BNXT_ULP_CLASS_HID_19ae4] = 4079,
+	[BNXT_ULP_CLASS_HID_18020] = 4080,
+	[BNXT_ULP_CLASS_HID_1d52c] = 4081,
+	[BNXT_ULP_CLASS_HID_1db68] = 4082,
+	[BNXT_ULP_CLASS_HID_1bf48] = 4083,
+	[BNXT_ULP_CLASS_HID_1a494] = 4084,
+	[BNXT_ULP_CLASS_HID_58d8c] = 4085,
+	[BNXT_ULP_CLASS_HID_5b3c8] = 4086,
+	[BNXT_ULP_CLASS_HID_59728] = 4087,
+	[BNXT_ULP_CLASS_HID_59d74] = 4088,
+	[BNXT_ULP_CLASS_HID_5ae70] = 4089,
+	[BNXT_ULP_CLASS_HID_5d7bc] = 4090,
+	[BNXT_ULP_CLASS_HID_5bb9c] = 4091,
+	[BNXT_ULP_CLASS_HID_5a1d8] = 4092,
+	[BNXT_ULP_CLASS_HID_c138] = 4093,
+	[BNXT_ULP_CLASS_HID_c704] = 4094,
+	[BNXT_ULP_CLASS_HID_c610] = 4095,
+	[BNXT_ULP_CLASS_HID_d0a0] = 4096,
+	[BNXT_ULP_CLASS_HID_e5ac] = 4097,
+	[BNXT_ULP_CLASS_HID_ebe8] = 4098,
+	[BNXT_ULP_CLASS_HID_cfc8] = 4099,
+	[BNXT_ULP_CLASS_HID_f514] = 4100,
+	[BNXT_ULP_CLASS_HID_4da0c] = 4101,
+	[BNXT_ULP_CLASS_HID_4c048] = 4102,
+	[BNXT_ULP_CLASS_HID_4c364] = 4103,
+	[BNXT_ULP_CLASS_HID_4c8a0] = 4104,
+	[BNXT_ULP_CLASS_HID_4fef0] = 4105,
+	[BNXT_ULP_CLASS_HID_4e43c] = 4106,
+	[BNXT_ULP_CLASS_HID_4c81c] = 4107,
+	[BNXT_ULP_CLASS_HID_4ce58] = 4108,
+	[BNXT_ULP_CLASS_HID_1f738] = 4109,
+	[BNXT_ULP_CLASS_HID_1fd04] = 4110,
+	[BNXT_ULP_CLASS_HID_1c164] = 4111,
+	[BNXT_ULP_CLASS_HID_1c6a0] = 4112,
+	[BNXT_ULP_CLASS_HID_1dbac] = 4113,
+	[BNXT_ULP_CLASS_HID_1c1e8] = 4114,
+	[BNXT_ULP_CLASS_HID_1e5c8] = 4115,
+	[BNXT_ULP_CLASS_HID_1eb14] = 4116,
+	[BNXT_ULP_CLASS_HID_5f00c] = 4117,
+	[BNXT_ULP_CLASS_HID_5f648] = 4118,
+	[BNXT_ULP_CLASS_HID_5dda8] = 4119,
+	[BNXT_ULP_CLASS_HID_5c3f4] = 4120,
+	[BNXT_ULP_CLASS_HID_5d4f0] = 4121,
+	[BNXT_ULP_CLASS_HID_5da3c] = 4122,
+	[BNXT_ULP_CLASS_HID_5fe1c] = 4123,
+	[BNXT_ULP_CLASS_HID_5e458] = 4124,
+	[BNXT_ULP_CLASS_HID_bc78] = 4125,
+	[BNXT_ULP_CLASS_HID_a244] = 4126,
+	[BNXT_ULP_CLASS_HID_e550] = 4127,
+	[BNXT_ULP_CLASS_HID_ea9c] = 4128,
+	[BNXT_ULP_CLASS_HID_a0ec] = 4129,
+	[BNXT_ULP_CLASS_HID_a628] = 4130,
+	[BNXT_ULP_CLASS_HID_aa08] = 4131,
+	[BNXT_ULP_CLASS_HID_b054] = 4132,
+	[BNXT_ULP_CLASS_HID_4b94c] = 4133,
+	[BNXT_ULP_CLASS_HID_4be88] = 4134,
+	[BNXT_ULP_CLASS_HID_4e1a4] = 4135,
+	[BNXT_ULP_CLASS_HID_4e7e0] = 4136,
+	[BNXT_ULP_CLASS_HID_4bd30] = 4137,
+	[BNXT_ULP_CLASS_HID_4a37c] = 4138,
+	[BNXT_ULP_CLASS_HID_4a75c] = 4139,
+	[BNXT_ULP_CLASS_HID_4ac98] = 4140,
+	[BNXT_ULP_CLASS_HID_1b278] = 4141,
+	[BNXT_ULP_CLASS_HID_1b844] = 4142,
+	[BNXT_ULP_CLASS_HID_1bfa4] = 4143,
+	[BNXT_ULP_CLASS_HID_1a5e0] = 4144,
+	[BNXT_ULP_CLASS_HID_1f6ec] = 4145,
+	[BNXT_ULP_CLASS_HID_1fc28] = 4146,
+	[BNXT_ULP_CLASS_HID_1a008] = 4147,
+	[BNXT_ULP_CLASS_HID_1a654] = 4148,
+	[BNXT_ULP_CLASS_HID_5af4c] = 4149,
+	[BNXT_ULP_CLASS_HID_5b488] = 4150,
+	[BNXT_ULP_CLASS_HID_5b8e8] = 4151,
+	[BNXT_ULP_CLASS_HID_5be34] = 4152,
+	[BNXT_ULP_CLASS_HID_5f330] = 4153,
+	[BNXT_ULP_CLASS_HID_5f97c] = 4154,
+	[BNXT_ULP_CLASS_HID_5bd5c] = 4155,
+	[BNXT_ULP_CLASS_HID_5a298] = 4156,
+	[BNXT_ULP_CLASS_HID_e2f8] = 4157,
+	[BNXT_ULP_CLASS_HID_e8c4] = 4158,
+	[BNXT_ULP_CLASS_HID_ebd0] = 4159,
+	[BNXT_ULP_CLASS_HID_f260] = 4160,
+	[BNXT_ULP_CLASS_HID_e76c] = 4161,
+	[BNXT_ULP_CLASS_HID_eca8] = 4162,
+	[BNXT_ULP_CLASS_HID_f088] = 4163,
+	[BNXT_ULP_CLASS_HID_f6d4] = 4164,
+	[BNXT_ULP_CLASS_HID_4ffcc] = 4165,
+	[BNXT_ULP_CLASS_HID_4e508] = 4166,
+	[BNXT_ULP_CLASS_HID_4e424] = 4167,
+	[BNXT_ULP_CLASS_HID_4ea60] = 4168,
+	[BNXT_ULP_CLASS_HID_4e3b0] = 4169,
+	[BNXT_ULP_CLASS_HID_4e9fc] = 4170,
+	[BNXT_ULP_CLASS_HID_4eddc] = 4171,
+	[BNXT_ULP_CLASS_HID_4f318] = 4172,
+	[BNXT_ULP_CLASS_HID_1f8f8] = 4173,
+	[BNXT_ULP_CLASS_HID_1fec4] = 4174,
+	[BNXT_ULP_CLASS_HID_1e224] = 4175,
+	[BNXT_ULP_CLASS_HID_1e860] = 4176,
+	[BNXT_ULP_CLASS_HID_1fd6c] = 4177,
+	[BNXT_ULP_CLASS_HID_1e2a8] = 4178,
+	[BNXT_ULP_CLASS_HID_1e688] = 4179,
+	[BNXT_ULP_CLASS_HID_1ecd4] = 4180,
+	[BNXT_ULP_CLASS_HID_5f5cc] = 4181,
+	[BNXT_ULP_CLASS_HID_5fb08] = 4182,
+	[BNXT_ULP_CLASS_HID_5ff68] = 4183,
+	[BNXT_ULP_CLASS_HID_5e4b4] = 4184,
+	[BNXT_ULP_CLASS_HID_5f9b0] = 4185,
+	[BNXT_ULP_CLASS_HID_5fffc] = 4186,
+	[BNXT_ULP_CLASS_HID_5e3dc] = 4187,
+	[BNXT_ULP_CLASS_HID_5e918] = 4188,
+	[BNXT_ULP_CLASS_HID_23de0] = 4189,
+	[BNXT_ULP_CLASS_HID_223dc] = 4190,
+	[BNXT_ULP_CLASS_HID_207bc] = 4191,
+	[BNXT_ULP_CLASS_HID_20d78] = 4192,
+	[BNXT_ULP_CLASS_HID_25e74] = 4193,
+	[BNXT_ULP_CLASS_HID_24430] = 4194,
+	[BNXT_ULP_CLASS_HID_22810] = 4195,
+	[BNXT_ULP_CLASS_HID_251cc] = 4196,
+	[BNXT_ULP_CLASS_HID_20930] = 4197,
+	[BNXT_ULP_CLASS_HID_20eec] = 4198,
+	[BNXT_ULP_CLASS_HID_212cc] = 4199,
+	[BNXT_ULP_CLASS_HID_21888] = 4200,
+	[BNXT_ULP_CLASS_HID_22d84] = 4201,
+	[BNXT_ULP_CLASS_HID_25340] = 4202,
+	[BNXT_ULP_CLASS_HID_23720] = 4203,
+	[BNXT_ULP_CLASS_HID_23d1c] = 4204,
+	[BNXT_ULP_CLASS_HID_636d4] = 4205,
+	[BNXT_ULP_CLASS_HID_63c90] = 4206,
+	[BNXT_ULP_CLASS_HID_60070] = 4207,
+	[BNXT_ULP_CLASS_HID_6062c] = 4208,
+	[BNXT_ULP_CLASS_HID_65b28] = 4209,
+	[BNXT_ULP_CLASS_HID_640e4] = 4210,
+	[BNXT_ULP_CLASS_HID_624c4] = 4211,
+	[BNXT_ULP_CLASS_HID_62a80] = 4212,
+	[BNXT_ULP_CLASS_HID_605e4] = 4213,
+	[BNXT_ULP_CLASS_HID_60ba0] = 4214,
+	[BNXT_ULP_CLASS_HID_64acc] = 4215,
+	[BNXT_ULP_CLASS_HID_6157c] = 4216,
+	[BNXT_ULP_CLASS_HID_62678] = 4217,
+	[BNXT_ULP_CLASS_HID_62c34] = 4218,
+	[BNXT_ULP_CLASS_HID_63014] = 4219,
+	[BNXT_ULP_CLASS_HID_639d0] = 4220,
+	[BNXT_ULP_CLASS_HID_353e0] = 4221,
+	[BNXT_ULP_CLASS_HID_359dc] = 4222,
+	[BNXT_ULP_CLASS_HID_33dbc] = 4223,
+	[BNXT_ULP_CLASS_HID_32378] = 4224,
+	[BNXT_ULP_CLASS_HID_31928] = 4225,
+	[BNXT_ULP_CLASS_HID_31ee4] = 4226,
+	[BNXT_ULP_CLASS_HID_35e10] = 4227,
+	[BNXT_ULP_CLASS_HID_347cc] = 4228,
+	[BNXT_ULP_CLASS_HID_33f30] = 4229,
+	[BNXT_ULP_CLASS_HID_324ec] = 4230,
+	[BNXT_ULP_CLASS_HID_308cc] = 4231,
+	[BNXT_ULP_CLASS_HID_30e88] = 4232,
+	[BNXT_ULP_CLASS_HID_34384] = 4233,
+	[BNXT_ULP_CLASS_HID_34940] = 4234,
+	[BNXT_ULP_CLASS_HID_32d20] = 4235,
+	[BNXT_ULP_CLASS_HID_3531c] = 4236,
+	[BNXT_ULP_CLASS_HID_72cd4] = 4237,
+	[BNXT_ULP_CLASS_HID_75290] = 4238,
+	[BNXT_ULP_CLASS_HID_73670] = 4239,
+	[BNXT_ULP_CLASS_HID_73c2c] = 4240,
+	[BNXT_ULP_CLASS_HID_7121c] = 4241,
+	[BNXT_ULP_CLASS_HID_71bd8] = 4242,
+	[BNXT_ULP_CLASS_HID_75ac4] = 4243,
+	[BNXT_ULP_CLASS_HID_74080] = 4244,
+	[BNXT_ULP_CLASS_HID_73be4] = 4245,
+	[BNXT_ULP_CLASS_HID_721a0] = 4246,
+	[BNXT_ULP_CLASS_HID_70580] = 4247,
+	[BNXT_ULP_CLASS_HID_70b7c] = 4248,
+	[BNXT_ULP_CLASS_HID_75c78] = 4249,
+	[BNXT_ULP_CLASS_HID_74234] = 4250,
+	[BNXT_ULP_CLASS_HID_72614] = 4251,
+	[BNXT_ULP_CLASS_HID_72fd0] = 4252,
+	[BNXT_ULP_CLASS_HID_2a6e0] = 4253,
+	[BNXT_ULP_CLASS_HID_2acdc] = 4254,
+	[BNXT_ULP_CLASS_HID_2b0bc] = 4255,
+	[BNXT_ULP_CLASS_HID_2b678] = 4256,
+	[BNXT_ULP_CLASS_HID_2cb74] = 4257,
+	[BNXT_ULP_CLASS_HID_295e4] = 4258,
+	[BNXT_ULP_CLASS_HID_2d510] = 4259,
+	[BNXT_ULP_CLASS_HID_2dacc] = 4260,
+	[BNXT_ULP_CLASS_HID_2b230] = 4261,
+	[BNXT_ULP_CLASS_HID_2bbec] = 4262,
+	[BNXT_ULP_CLASS_HID_29fcc] = 4263,
+	[BNXT_ULP_CLASS_HID_28588] = 4264,
+	[BNXT_ULP_CLASS_HID_2d684] = 4265,
+	[BNXT_ULP_CLASS_HID_2dc40] = 4266,
+	[BNXT_ULP_CLASS_HID_2a020] = 4267,
+	[BNXT_ULP_CLASS_HID_2a61c] = 4268,
+	[BNXT_ULP_CLASS_HID_6a3d4] = 4269,
+	[BNXT_ULP_CLASS_HID_6a990] = 4270,
+	[BNXT_ULP_CLASS_HID_68d70] = 4271,
+	[BNXT_ULP_CLASS_HID_6b32c] = 4272,
+	[BNXT_ULP_CLASS_HID_6c428] = 4273,
+	[BNXT_ULP_CLASS_HID_6cde4] = 4274,
+	[BNXT_ULP_CLASS_HID_6d1c4] = 4275,
+	[BNXT_ULP_CLASS_HID_6d780] = 4276,
+	[BNXT_ULP_CLASS_HID_68ee4] = 4277,
+	[BNXT_ULP_CLASS_HID_6b4a0] = 4278,
+	[BNXT_ULP_CLASS_HID_69880] = 4279,
+	[BNXT_ULP_CLASS_HID_69e7c] = 4280,
+	[BNXT_ULP_CLASS_HID_6d378] = 4281,
+	[BNXT_ULP_CLASS_HID_6d934] = 4282,
+	[BNXT_ULP_CLASS_HID_6bd14] = 4283,
+	[BNXT_ULP_CLASS_HID_6a2d0] = 4284,
+	[BNXT_ULP_CLASS_HID_3dce0] = 4285,
+	[BNXT_ULP_CLASS_HID_3c2dc] = 4286,
+	[BNXT_ULP_CLASS_HID_3a6bc] = 4287,
+	[BNXT_ULP_CLASS_HID_3ac78] = 4288,
+	[BNXT_ULP_CLASS_HID_38228] = 4289,
+	[BNXT_ULP_CLASS_HID_38be4] = 4290,
+	[BNXT_ULP_CLASS_HID_3cb10] = 4291,
+	[BNXT_ULP_CLASS_HID_39580] = 4292,
+	[BNXT_ULP_CLASS_HID_3a830] = 4293,
+	[BNXT_ULP_CLASS_HID_3d1ec] = 4294,
+	[BNXT_ULP_CLASS_HID_3b5cc] = 4295,
+	[BNXT_ULP_CLASS_HID_3bb88] = 4296,
+	[BNXT_ULP_CLASS_HID_39178] = 4297,
+	[BNXT_ULP_CLASS_HID_39734] = 4298,
+	[BNXT_ULP_CLASS_HID_3d620] = 4299,
+	[BNXT_ULP_CLASS_HID_3dc1c] = 4300,
+	[BNXT_ULP_CLASS_HID_7d9d4] = 4301,
+	[BNXT_ULP_CLASS_HID_7df90] = 4302,
+	[BNXT_ULP_CLASS_HID_7a370] = 4303,
+	[BNXT_ULP_CLASS_HID_7a92c] = 4304,
+	[BNXT_ULP_CLASS_HID_79f1c] = 4305,
+	[BNXT_ULP_CLASS_HID_784d8] = 4306,
+	[BNXT_ULP_CLASS_HID_7c7c4] = 4307,
+	[BNXT_ULP_CLASS_HID_7cd80] = 4308,
+	[BNXT_ULP_CLASS_HID_7a4e4] = 4309,
+	[BNXT_ULP_CLASS_HID_7aaa0] = 4310,
+	[BNXT_ULP_CLASS_HID_78e80] = 4311,
+	[BNXT_ULP_CLASS_HID_7b47c] = 4312,
+	[BNXT_ULP_CLASS_HID_7c978] = 4313,
+	[BNXT_ULP_CLASS_HID_793e8] = 4314,
+	[BNXT_ULP_CLASS_HID_7d314] = 4315,
+	[BNXT_ULP_CLASS_HID_7d8d0] = 4316,
+	[BNXT_ULP_CLASS_HID_9ad8] = 4317,
+	[BNXT_ULP_CLASS_HID_80e4] = 4318,
+	[BNXT_ULP_CLASS_HID_c3f0] = 4319,
+	[BNXT_ULP_CLASS_HID_c9bc] = 4320,
+	[BNXT_ULP_CLASS_HID_bf4c] = 4321,
+	[BNXT_ULP_CLASS_HID_a508] = 4322,
+	[BNXT_ULP_CLASS_HID_8928] = 4323,
+	[BNXT_ULP_CLASS_HID_8ef4] = 4324,
+	[BNXT_ULP_CLASS_HID_497ec] = 4325,
+	[BNXT_ULP_CLASS_HID_49da8] = 4326,
+	[BNXT_ULP_CLASS_HID_4dc84] = 4327,
+	[BNXT_ULP_CLASS_HID_4c240] = 4328,
+	[BNXT_ULP_CLASS_HID_4b810] = 4329,
+	[BNXT_ULP_CLASS_HID_4a1dc] = 4330,
+	[BNXT_ULP_CLASS_HID_485fc] = 4331,
+	[BNXT_ULP_CLASS_HID_48bb8] = 4332,
+	[BNXT_ULP_CLASS_HID_1b0d8] = 4333,
+	[BNXT_ULP_CLASS_HID_1b6e4] = 4334,
+	[BNXT_ULP_CLASS_HID_19a84] = 4335,
+	[BNXT_ULP_CLASS_HID_18040] = 4336,
+	[BNXT_ULP_CLASS_HID_1d54c] = 4337,
+	[BNXT_ULP_CLASS_HID_1db08] = 4338,
+	[BNXT_ULP_CLASS_HID_1bf28] = 4339,
+	[BNXT_ULP_CLASS_HID_1a4f4] = 4340,
+	[BNXT_ULP_CLASS_HID_58dec] = 4341,
+	[BNXT_ULP_CLASS_HID_5b3a8] = 4342,
+	[BNXT_ULP_CLASS_HID_59748] = 4343,
+	[BNXT_ULP_CLASS_HID_59d14] = 4344,
+	[BNXT_ULP_CLASS_HID_5ae10] = 4345,
+	[BNXT_ULP_CLASS_HID_5d7dc] = 4346,
+	[BNXT_ULP_CLASS_HID_5bbfc] = 4347,
+	[BNXT_ULP_CLASS_HID_5a1b8] = 4348,
+	[BNXT_ULP_CLASS_HID_c158] = 4349,
+	[BNXT_ULP_CLASS_HID_c764] = 4350,
+	[BNXT_ULP_CLASS_HID_c670] = 4351,
+	[BNXT_ULP_CLASS_HID_d0c0] = 4352,
+	[BNXT_ULP_CLASS_HID_e5cc] = 4353,
+	[BNXT_ULP_CLASS_HID_eb88] = 4354,
+	[BNXT_ULP_CLASS_HID_cfa8] = 4355,
+	[BNXT_ULP_CLASS_HID_f574] = 4356,
+	[BNXT_ULP_CLASS_HID_4da6c] = 4357,
+	[BNXT_ULP_CLASS_HID_4c028] = 4358,
+	[BNXT_ULP_CLASS_HID_4c304] = 4359,
+	[BNXT_ULP_CLASS_HID_4c8c0] = 4360,
+	[BNXT_ULP_CLASS_HID_4fe90] = 4361,
+	[BNXT_ULP_CLASS_HID_4e45c] = 4362,
+	[BNXT_ULP_CLASS_HID_4c87c] = 4363,
+	[BNXT_ULP_CLASS_HID_4ce38] = 4364,
+	[BNXT_ULP_CLASS_HID_1f758] = 4365,
+	[BNXT_ULP_CLASS_HID_1fd64] = 4366,
+	[BNXT_ULP_CLASS_HID_1c104] = 4367,
+	[BNXT_ULP_CLASS_HID_1c6c0] = 4368,
+	[BNXT_ULP_CLASS_HID_1dbcc] = 4369,
+	[BNXT_ULP_CLASS_HID_1c188] = 4370,
+	[BNXT_ULP_CLASS_HID_1e5a8] = 4371,
+	[BNXT_ULP_CLASS_HID_1eb74] = 4372,
+	[BNXT_ULP_CLASS_HID_5f06c] = 4373,
+	[BNXT_ULP_CLASS_HID_5f628] = 4374,
+	[BNXT_ULP_CLASS_HID_5ddc8] = 4375,
+	[BNXT_ULP_CLASS_HID_5c394] = 4376,
+	[BNXT_ULP_CLASS_HID_5d490] = 4377,
+	[BNXT_ULP_CLASS_HID_5da5c] = 4378,
+	[BNXT_ULP_CLASS_HID_5fe7c] = 4379,
+	[BNXT_ULP_CLASS_HID_5e438] = 4380,
+	[BNXT_ULP_CLASS_HID_bc18] = 4381,
+	[BNXT_ULP_CLASS_HID_a224] = 4382,
+	[BNXT_ULP_CLASS_HID_e530] = 4383,
+	[BNXT_ULP_CLASS_HID_eafc] = 4384,
+	[BNXT_ULP_CLASS_HID_a08c] = 4385,
+	[BNXT_ULP_CLASS_HID_a648] = 4386,
+	[BNXT_ULP_CLASS_HID_aa68] = 4387,
+	[BNXT_ULP_CLASS_HID_b034] = 4388,
+	[BNXT_ULP_CLASS_HID_4b92c] = 4389,
+	[BNXT_ULP_CLASS_HID_4bee8] = 4390,
+	[BNXT_ULP_CLASS_HID_4e1c4] = 4391,
+	[BNXT_ULP_CLASS_HID_4e780] = 4392,
+	[BNXT_ULP_CLASS_HID_4bd50] = 4393,
+	[BNXT_ULP_CLASS_HID_4a31c] = 4394,
+	[BNXT_ULP_CLASS_HID_4a73c] = 4395,
+	[BNXT_ULP_CLASS_HID_4acf8] = 4396,
+	[BNXT_ULP_CLASS_HID_1b218] = 4397,
+	[BNXT_ULP_CLASS_HID_1b824] = 4398,
+	[BNXT_ULP_CLASS_HID_1bfc4] = 4399,
+	[BNXT_ULP_CLASS_HID_1a580] = 4400,
+	[BNXT_ULP_CLASS_HID_1f68c] = 4401,
+	[BNXT_ULP_CLASS_HID_1fc48] = 4402,
+	[BNXT_ULP_CLASS_HID_1a068] = 4403,
+	[BNXT_ULP_CLASS_HID_1a634] = 4404,
+	[BNXT_ULP_CLASS_HID_5af2c] = 4405,
+	[BNXT_ULP_CLASS_HID_5b4e8] = 4406,
+	[BNXT_ULP_CLASS_HID_5b888] = 4407,
+	[BNXT_ULP_CLASS_HID_5be54] = 4408,
+	[BNXT_ULP_CLASS_HID_5f350] = 4409,
+	[BNXT_ULP_CLASS_HID_5f91c] = 4410,
+	[BNXT_ULP_CLASS_HID_5bd3c] = 4411,
+	[BNXT_ULP_CLASS_HID_5a2f8] = 4412,
+	[BNXT_ULP_CLASS_HID_e298] = 4413,
+	[BNXT_ULP_CLASS_HID_e8a4] = 4414,
+	[BNXT_ULP_CLASS_HID_ebb0] = 4415,
+	[BNXT_ULP_CLASS_HID_f200] = 4416,
+	[BNXT_ULP_CLASS_HID_e70c] = 4417,
+	[BNXT_ULP_CLASS_HID_ecc8] = 4418,
+	[BNXT_ULP_CLASS_HID_f0e8] = 4419,
+	[BNXT_ULP_CLASS_HID_f6b4] = 4420,
+	[BNXT_ULP_CLASS_HID_4ffac] = 4421,
+	[BNXT_ULP_CLASS_HID_4e568] = 4422,
+	[BNXT_ULP_CLASS_HID_4e444] = 4423,
+	[BNXT_ULP_CLASS_HID_4ea00] = 4424,
+	[BNXT_ULP_CLASS_HID_4e3d0] = 4425,
+	[BNXT_ULP_CLASS_HID_4e99c] = 4426,
+	[BNXT_ULP_CLASS_HID_4edbc] = 4427,
+	[BNXT_ULP_CLASS_HID_4f378] = 4428,
+	[BNXT_ULP_CLASS_HID_1f898] = 4429,
+	[BNXT_ULP_CLASS_HID_1fea4] = 4430,
+	[BNXT_ULP_CLASS_HID_1e244] = 4431,
+	[BNXT_ULP_CLASS_HID_1e800] = 4432,
+	[BNXT_ULP_CLASS_HID_1fd0c] = 4433,
+	[BNXT_ULP_CLASS_HID_1e2c8] = 4434,
+	[BNXT_ULP_CLASS_HID_1e6e8] = 4435,
+	[BNXT_ULP_CLASS_HID_1ecb4] = 4436,
+	[BNXT_ULP_CLASS_HID_5f5ac] = 4437,
+	[BNXT_ULP_CLASS_HID_5fb68] = 4438,
+	[BNXT_ULP_CLASS_HID_5ff08] = 4439,
+	[BNXT_ULP_CLASS_HID_5e4d4] = 4440,
+	[BNXT_ULP_CLASS_HID_5f9d0] = 4441,
+	[BNXT_ULP_CLASS_HID_5ff9c] = 4442,
+	[BNXT_ULP_CLASS_HID_5e3bc] = 4443,
+	[BNXT_ULP_CLASS_HID_5e978] = 4444,
+	[BNXT_ULP_CLASS_HID_34f6] = 4445,
+	[BNXT_ULP_CLASS_HID_3a3a] = 4446,
+	[BNXT_ULP_CLASS_HID_541e] = 4447,
+	[BNXT_ULP_CLASS_HID_5a22] = 4448,
+	[BNXT_ULP_CLASS_HID_34fe] = 4449,
+	[BNXT_ULP_CLASS_HID_3a32] = 4450,
+	[BNXT_ULP_CLASS_HID_4a42] = 4451,
+	[BNXT_ULP_CLASS_HID_14d2] = 4452,
+	[BNXT_ULP_CLASS_HID_34c8] = 4453,
+	[BNXT_ULP_CLASS_HID_3a04] = 4454,
+	[BNXT_ULP_CLASS_HID_1e64] = 4455,
+	[BNXT_ULP_CLASS_HID_07a0] = 4456,
+	[BNXT_ULP_CLASS_HID_595c] = 4457,
+	[BNXT_ULP_CLASS_HID_5e98] = 4458,
+	[BNXT_ULP_CLASS_HID_22f8] = 4459,
+	[BNXT_ULP_CLASS_HID_2834] = 4460,
+	[BNXT_ULP_CLASS_HID_0398] = 4461,
+	[BNXT_ULP_CLASS_HID_09d4] = 4462,
+	[BNXT_ULP_CLASS_HID_48c0] = 4463,
+	[BNXT_ULP_CLASS_HID_1370] = 4464,
+	[BNXT_ULP_CLASS_HID_246c] = 4465,
+	[BNXT_ULP_CLASS_HID_2da8] = 4466,
+	[BNXT_ULP_CLASS_HID_3188] = 4467,
+	[BNXT_ULP_CLASS_HID_37c4] = 4468,
+	[BNXT_ULP_CLASS_HID_34f0] = 4469,
+	[BNXT_ULP_CLASS_HID_3a3c] = 4470,
+	[BNXT_ULP_CLASS_HID_1e5c] = 4471,
+	[BNXT_ULP_CLASS_HID_0798] = 4472,
+	[BNXT_ULP_CLASS_HID_5964] = 4473,
+	[BNXT_ULP_CLASS_HID_5ea0] = 4474,
+	[BNXT_ULP_CLASS_HID_22c0] = 4475,
+	[BNXT_ULP_CLASS_HID_280c] = 4476,
+	[BNXT_ULP_CLASS_HID_43104] = 4477,
+	[BNXT_ULP_CLASS_HID_43740] = 4478,
+	[BNXT_ULP_CLASS_HID_41b60] = 4479,
+	[BNXT_ULP_CLASS_HID_400ac] = 4480,
+	[BNXT_ULP_CLASS_HID_455a8] = 4481,
+	[BNXT_ULP_CLASS_HID_45bf4] = 4482,
+	[BNXT_ULP_CLASS_HID_43f14] = 4483,
+	[BNXT_ULP_CLASS_HID_42550] = 4484,
+	[BNXT_ULP_CLASS_HID_34d6] = 4485,
+	[BNXT_ULP_CLASS_HID_3a1a] = 4486,
+	[BNXT_ULP_CLASS_HID_543e] = 4487,
+	[BNXT_ULP_CLASS_HID_5a02] = 4488,
+	[BNXT_ULP_CLASS_HID_34de] = 4489,
+	[BNXT_ULP_CLASS_HID_3a12] = 4490,
+	[BNXT_ULP_CLASS_HID_4a62] = 4491,
+	[BNXT_ULP_CLASS_HID_14f2] = 4492,
+	[BNXT_ULP_CLASS_HID_34b6] = 4493,
+	[BNXT_ULP_CLASS_HID_3a7a] = 4494,
+	[BNXT_ULP_CLASS_HID_545e] = 4495,
+	[BNXT_ULP_CLASS_HID_5a62] = 4496,
+	[BNXT_ULP_CLASS_HID_34be] = 4497,
+	[BNXT_ULP_CLASS_HID_3a72] = 4498,
+	[BNXT_ULP_CLASS_HID_4a02] = 4499,
+	[BNXT_ULP_CLASS_HID_1492] = 4500,
+	[BNXT_ULP_CLASS_HID_34a8] = 4501,
+	[BNXT_ULP_CLASS_HID_3a64] = 4502,
+	[BNXT_ULP_CLASS_HID_1e04] = 4503,
+	[BNXT_ULP_CLASS_HID_07c0] = 4504,
+	[BNXT_ULP_CLASS_HID_593c] = 4505,
+	[BNXT_ULP_CLASS_HID_5ef8] = 4506,
+	[BNXT_ULP_CLASS_HID_2298] = 4507,
+	[BNXT_ULP_CLASS_HID_2854] = 4508,
+	[BNXT_ULP_CLASS_HID_03f8] = 4509,
+	[BNXT_ULP_CLASS_HID_09b4] = 4510,
+	[BNXT_ULP_CLASS_HID_48a0] = 4511,
+	[BNXT_ULP_CLASS_HID_1310] = 4512,
+	[BNXT_ULP_CLASS_HID_240c] = 4513,
+	[BNXT_ULP_CLASS_HID_2dc8] = 4514,
+	[BNXT_ULP_CLASS_HID_31e8] = 4515,
+	[BNXT_ULP_CLASS_HID_37a4] = 4516,
+	[BNXT_ULP_CLASS_HID_34d0] = 4517,
+	[BNXT_ULP_CLASS_HID_3a1c] = 4518,
+	[BNXT_ULP_CLASS_HID_1e7c] = 4519,
+	[BNXT_ULP_CLASS_HID_07b8] = 4520,
+	[BNXT_ULP_CLASS_HID_5944] = 4521,
+	[BNXT_ULP_CLASS_HID_5e80] = 4522,
+	[BNXT_ULP_CLASS_HID_22e0] = 4523,
+	[BNXT_ULP_CLASS_HID_282c] = 4524,
+	[BNXT_ULP_CLASS_HID_43124] = 4525,
+	[BNXT_ULP_CLASS_HID_43760] = 4526,
+	[BNXT_ULP_CLASS_HID_41b40] = 4527,
+	[BNXT_ULP_CLASS_HID_4008c] = 4528,
+	[BNXT_ULP_CLASS_HID_45588] = 4529,
+	[BNXT_ULP_CLASS_HID_45bd4] = 4530,
+	[BNXT_ULP_CLASS_HID_43f34] = 4531,
+	[BNXT_ULP_CLASS_HID_42570] = 4532,
+	[BNXT_ULP_CLASS_HID_3488] = 4533,
+	[BNXT_ULP_CLASS_HID_3a44] = 4534,
+	[BNXT_ULP_CLASS_HID_1e24] = 4535,
+	[BNXT_ULP_CLASS_HID_07e0] = 4536,
+	[BNXT_ULP_CLASS_HID_591c] = 4537,
+	[BNXT_ULP_CLASS_HID_5ed8] = 4538,
+	[BNXT_ULP_CLASS_HID_22b8] = 4539,
+	[BNXT_ULP_CLASS_HID_2874] = 4540,
+	[BNXT_ULP_CLASS_HID_03d8] = 4541,
+	[BNXT_ULP_CLASS_HID_0994] = 4542,
+	[BNXT_ULP_CLASS_HID_4880] = 4543,
+	[BNXT_ULP_CLASS_HID_1330] = 4544,
+	[BNXT_ULP_CLASS_HID_242c] = 4545,
+	[BNXT_ULP_CLASS_HID_2de8] = 4546,
+	[BNXT_ULP_CLASS_HID_31c8] = 4547,
+	[BNXT_ULP_CLASS_HID_3784] = 4548,
+	[BNXT_ULP_CLASS_HID_34b0] = 4549,
+	[BNXT_ULP_CLASS_HID_3a7c] = 4550,
+	[BNXT_ULP_CLASS_HID_1e1c] = 4551,
+	[BNXT_ULP_CLASS_HID_07d8] = 4552,
+	[BNXT_ULP_CLASS_HID_5924] = 4553,
+	[BNXT_ULP_CLASS_HID_5ee0] = 4554,
+	[BNXT_ULP_CLASS_HID_2280] = 4555,
+	[BNXT_ULP_CLASS_HID_284c] = 4556,
+	[BNXT_ULP_CLASS_HID_43144] = 4557,
+	[BNXT_ULP_CLASS_HID_43700] = 4558,
+	[BNXT_ULP_CLASS_HID_41b20] = 4559,
+	[BNXT_ULP_CLASS_HID_400ec] = 4560,
+	[BNXT_ULP_CLASS_HID_455e8] = 4561,
+	[BNXT_ULP_CLASS_HID_45bb4] = 4562,
+	[BNXT_ULP_CLASS_HID_43f54] = 4563,
+	[BNXT_ULP_CLASS_HID_42510] = 4564
 };
 
 /* Array for the proto matcher list */
 struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 	[1] = {
-	.class_hid = BNXT_ULP_CLASS_HID_26d1,
+	.class_hid = BNXT_ULP_CLASS_HID_05d1,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 0,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0071,
+	.class_hid = BNXT_ULP_CLASS_HID_1229,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 1,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[3] = {
-	.class_hid = BNXT_ULP_CLASS_HID_53a5,
+	.class_hid = BNXT_ULP_CLASS_HID_0bed,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 1,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[4] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d49,
+	.class_hid = BNXT_ULP_CLASS_HID_1865,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 2,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[5] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2095,
+	.class_hid = BNXT_ULP_CLASS_HID_25c9,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 2,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[6] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5701,
+	.class_hid = BNXT_ULP_CLASS_HID_3241,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 2,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[7] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4d79,
+	.class_hid = BNXT_ULP_CLASS_HID_2c05,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 2,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[8] = {
-	.class_hid = BNXT_ULP_CLASS_HID_170d,
+	.class_hid = BNXT_ULP_CLASS_HID_389d,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 2,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[9] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a69,
+	.class_hid = BNXT_ULP_CLASS_HID_3c3d,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 2,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[10] = {
-	.class_hid = BNXT_ULP_CLASS_HID_50c5,
+	.class_hid = BNXT_ULP_CLASS_HID_48b5,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 3,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[11] = {
-	.class_hid = BNXT_ULP_CLASS_HID_473d,
+	.class_hid = BNXT_ULP_CLASS_HID_4279,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 3,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[12] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10c1,
+	.class_hid = BNXT_ULP_CLASS_HID_4ef1,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 4,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[13] = {
-	.class_hid = BNXT_ULP_CLASS_HID_142d,
+	.class_hid = BNXT_ULP_CLASS_HID_5c55,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 4,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[14] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a99,
+	.class_hid = BNXT_ULP_CLASS_HID_0be1,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 4,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[15] = {
-	.class_hid = BNXT_ULP_CLASS_HID_40f1,
+	.class_hid = BNXT_ULP_CLASS_HID_05a5,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 4,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[16] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0a85,
+	.class_hid = BNXT_ULP_CLASS_HID_123d,
 	.class_tid = 1,
 	.hdr_sig_id = 0,
-	.flow_sig_id = 4,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[17] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0179,
+	.class_hid = BNXT_ULP_CLASS_HID_4142d,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 4,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[18] = {
-	.class_hid = BNXT_ULP_CLASS_HID_37d5,
+	.class_hid = BNXT_ULP_CLASS_HID_42095,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 5,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16392,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[19] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2e4d,
+	.class_hid = BNXT_ULP_CLASS_HID_41a69,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 5,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[20] = {
-	.class_hid = BNXT_ULP_CLASS_HID_54ad,
+	.class_hid = BNXT_ULP_CLASS_HID_426d1,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 6,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16392,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[21] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5809,
+	.class_hid = BNXT_ULP_CLASS_HID_44a99,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 6,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[22] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31a9,
+	.class_hid = BNXT_ULP_CLASS_HID_45701,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 6,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16392,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[23] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2801,
+	.class_hid = BNXT_ULP_CLASS_HID_450c5,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 6,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[24] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4e61,
+	.class_hid = BNXT_ULP_CLASS_HID_40071,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 6,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16392,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[25] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2561,
+	.class_hid = BNXT_ULP_CLASS_HID_40a85,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 6,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[26] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bad,
+	.class_hid = BNXT_ULP_CLASS_HID_4170d,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 7,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24584,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[27] = {
-	.class_hid = BNXT_ULP_CLASS_HID_054d,
+	.class_hid = BNXT_ULP_CLASS_HID_410c1,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 7,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[28] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5bdd,
+	.class_hid = BNXT_ULP_CLASS_HID_41d49,
 	.class_tid = 1,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 7,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24584,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[29] = {
-	.class_hid = BNXT_ULP_CLASS_HID_26f1,
+	.class_hid = BNXT_ULP_CLASS_HID_440f1,
 	.class_tid = 1,
 	.hdr_sig_id = 1,
-	.flow_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
 		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[30] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13cf1,
+	.class_hid = BNXT_ULP_CLASS_HID_44d79,
 	.class_tid = 1,
 	.hdr_sig_id = 1,
-	.flow_sig_id = 7,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
 		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[31] = {
-	.class_hid = BNXT_ULP_CLASS_HID_252f1,
+	.class_hid = BNXT_ULP_CLASS_HID_4473d,
 	.class_tid = 1,
 	.hdr_sig_id = 1,
-	.flow_sig_id = 8,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
 		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[32] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30c25,
+	.class_hid = BNXT_ULP_CLASS_HID_453a5,
 	.class_tid = 1,
 	.hdr_sig_id = 1,
-	.flow_sig_id = 9,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
 		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
 		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[33] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0051,
+	.class_hid = BNXT_ULP_CLASS_HID_244e3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 10,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[34] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11651,
+	.class_hid = BNXT_ULP_CLASS_HID_2517b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 10,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[35] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c51,
+	.class_hid = BNXT_ULP_CLASS_HID_24b3f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 10,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[36] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34251,
+	.class_hid = BNXT_ULP_CLASS_HID_257b7,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 10,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[37] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5385,
+	.class_hid = BNXT_ULP_CLASS_HID_22f5f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 10,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[38] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10cc9,
+	.class_hid = BNXT_ULP_CLASS_HID_23bd7,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 10,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[39] = {
-	.class_hid = BNXT_ULP_CLASS_HID_222c9,
+	.class_hid = BNXT_ULP_CLASS_HID_2359b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 11,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[40] = {
-	.class_hid = BNXT_ULP_CLASS_HID_338c9,
+	.class_hid = BNXT_ULP_CLASS_HID_24213,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 12,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[41] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d69,
+	.class_hid = BNXT_ULP_CLASS_HID_20bab,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[42] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13369,
+	.class_hid = BNXT_ULP_CLASS_HID_21823,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[43] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24969,
+	.class_hid = BNXT_ULP_CLASS_HID_211e7,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[44] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3025d,
+	.class_hid = BNXT_ULP_CLASS_HID_21e7f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[45] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20b5,
+	.class_hid = BNXT_ULP_CLASS_HID_252f3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[46] = {
-	.class_hid = BNXT_ULP_CLASS_HID_136b5,
+	.class_hid = BNXT_ULP_CLASS_HID_2029f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[47] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24cb5,
+	.class_hid = BNXT_ULP_CLASS_HID_2590f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[48] = {
-	.class_hid = BNXT_ULP_CLASS_HID_305f9,
+	.class_hid = BNXT_ULP_CLASS_HID_208db,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[49] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5721,
+	.class_hid = BNXT_ULP_CLASS_HID_231d3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[50] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11015,
+	.class_hid = BNXT_ULP_CLASS_HID_23e2b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[51] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22615,
+	.class_hid = BNXT_ULP_CLASS_HID_237ef,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[52] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33c15,
+	.class_hid = BNXT_ULP_CLASS_HID_24467,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[53] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4d59,
+	.class_hid = BNXT_ULP_CLASS_HID_21c0f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[54] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1068d,
+	.class_hid = BNXT_ULP_CLASS_HID_22887,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[55] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21c8d,
+	.class_hid = BNXT_ULP_CLASS_HID_2224b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[56] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3328d,
+	.class_hid = BNXT_ULP_CLASS_HID_22ec3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[57] = {
-	.class_hid = BNXT_ULP_CLASS_HID_172d,
+	.class_hid = BNXT_ULP_CLASS_HID_25547,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[58] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12d2d,
+	.class_hid = BNXT_ULP_CLASS_HID_20513,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[59] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2432d,
+	.class_hid = BNXT_ULP_CLASS_HID_25b83,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[60] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3592d,
+	.class_hid = BNXT_ULP_CLASS_HID_20b2f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[61] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a49,
+	.class_hid = BNXT_ULP_CLASS_HID_23fa3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[62] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13049,
+	.class_hid = BNXT_ULP_CLASS_HID_24c3b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 13,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[63] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24649,
+	.class_hid = BNXT_ULP_CLASS_HID_245ff,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 14,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[64] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35c49,
+	.class_hid = BNXT_ULP_CLASS_HID_25277,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 15,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[65] = {
-	.class_hid = BNXT_ULP_CLASS_HID_50e5,
+	.class_hid = BNXT_ULP_CLASS_HID_64037,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 16,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[66] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10a29,
+	.class_hid = BNXT_ULP_CLASS_HID_64c8f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 16,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[67] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22029,
+	.class_hid = BNXT_ULP_CLASS_HID_64673,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 16,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[68] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33629,
+	.class_hid = BNXT_ULP_CLASS_HID_652cb,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 16,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[69] = {
-	.class_hid = BNXT_ULP_CLASS_HID_471d,
+	.class_hid = BNXT_ULP_CLASS_HID_62a93,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 16,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[70] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10041,
+	.class_hid = BNXT_ULP_CLASS_HID_636eb,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 16,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[71] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21641,
+	.class_hid = BNXT_ULP_CLASS_HID_630af,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 17,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[72] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32c41,
+	.class_hid = BNXT_ULP_CLASS_HID_63d27,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 18,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[73] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10e1,
+	.class_hid = BNXT_ULP_CLASS_HID_606ff,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[74] = {
-	.class_hid = BNXT_ULP_CLASS_HID_126e1,
+	.class_hid = BNXT_ULP_CLASS_HID_61377,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[75] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23ce1,
+	.class_hid = BNXT_ULP_CLASS_HID_60d3b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[76] = {
-	.class_hid = BNXT_ULP_CLASS_HID_352e1,
+	.class_hid = BNXT_ULP_CLASS_HID_619b3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[77] = {
-	.class_hid = BNXT_ULP_CLASS_HID_140d,
+	.class_hid = BNXT_ULP_CLASS_HID_64e07,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[78] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12a0d,
+	.class_hid = BNXT_ULP_CLASS_HID_65a9f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[79] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2400d,
+	.class_hid = BNXT_ULP_CLASS_HID_65443,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[80] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3560d,
+	.class_hid = BNXT_ULP_CLASS_HID_603ef,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[81] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4ab9,
+	.class_hid = BNXT_ULP_CLASS_HID_62ce7,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[82] = {
-	.class_hid = BNXT_ULP_CLASS_HID_103ed,
+	.class_hid = BNXT_ULP_CLASS_HID_6397f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[83] = {
-	.class_hid = BNXT_ULP_CLASS_HID_219ed,
+	.class_hid = BNXT_ULP_CLASS_HID_63323,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[84] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32fed,
+	.class_hid = BNXT_ULP_CLASS_HID_63fbb,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[85] = {
-	.class_hid = BNXT_ULP_CLASS_HID_40d1,
+	.class_hid = BNXT_ULP_CLASS_HID_61743,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[86] = {
-	.class_hid = BNXT_ULP_CLASS_HID_156d1,
+	.class_hid = BNXT_ULP_CLASS_HID_623db,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[87] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21005,
+	.class_hid = BNXT_ULP_CLASS_HID_61d9f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[88] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32605,
+	.class_hid = BNXT_ULP_CLASS_HID_62a17,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[89] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0aa5,
+	.class_hid = BNXT_ULP_CLASS_HID_6509b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[90] = {
-	.class_hid = BNXT_ULP_CLASS_HID_120a5,
+	.class_hid = BNXT_ULP_CLASS_HID_60027,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[91] = {
-	.class_hid = BNXT_ULP_CLASS_HID_236a5,
+	.class_hid = BNXT_ULP_CLASS_HID_656d7,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[92] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34ca5,
+	.class_hid = BNXT_ULP_CLASS_HID_60663,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[93] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0159,
+	.class_hid = BNXT_ULP_CLASS_HID_63af7,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[94] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11759,
+	.class_hid = BNXT_ULP_CLASS_HID_6474f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 19,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[95] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22d59,
+	.class_hid = BNXT_ULP_CLASS_HID_64133,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 20,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[96] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34359,
+	.class_hid = BNXT_ULP_CLASS_HID_64d8b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 21,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[97] = {
-	.class_hid = BNXT_ULP_CLASS_HID_37f5,
+	.class_hid = BNXT_ULP_CLASS_HID_a3fb,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 22,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[98] = {
-	.class_hid = BNXT_ULP_CLASS_HID_14df5,
+	.class_hid = BNXT_ULP_CLASS_HID_b063,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 22,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[99] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20739,
+	.class_hid = BNXT_ULP_CLASS_HID_aa27,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 22,
-	.flow_pattern_id = 1,
-	.hdr_sig = { .bits =
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[100] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31d39,
+	.class_hid = BNXT_ULP_CLASS_HID_b6af,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 22,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[101] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2e6d,
+	.class_hid = BNXT_ULP_CLASS_HID_8e47,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 22,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[102] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1446d,
+	.class_hid = BNXT_ULP_CLASS_HID_9acf,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 22,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[103] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25a6d,
+	.class_hid = BNXT_ULP_CLASS_HID_9483,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 23,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[104] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31351,
+	.class_hid = BNXT_ULP_CLASS_HID_a10b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 24,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[105] = {
-	.class_hid = BNXT_ULP_CLASS_HID_548d,
+	.class_hid = BNXT_ULP_CLASS_HID_c78f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[106] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10df1,
+	.class_hid = BNXT_ULP_CLASS_HID_d3f7,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[107] = {
-	.class_hid = BNXT_ULP_CLASS_HID_223f1,
+	.class_hid = BNXT_ULP_CLASS_HID_cdcb,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[108] = {
-	.class_hid = BNXT_ULP_CLASS_HID_339f1,
+	.class_hid = BNXT_ULP_CLASS_HID_da33,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[109] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5829,
+	.class_hid = BNXT_ULP_CLASS_HID_b1eb,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[110] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1111d,
+	.class_hid = BNXT_ULP_CLASS_HID_be53,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[111] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2271d,
+	.class_hid = BNXT_ULP_CLASS_HID_b817,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[112] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33d1d,
+	.class_hid = BNXT_ULP_CLASS_HID_c49f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[113] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3189,
+	.class_hid = BNXT_ULP_CLASS_HID_49f2f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[114] = {
-	.class_hid = BNXT_ULP_CLASS_HID_14789,
+	.class_hid = BNXT_ULP_CLASS_HID_4ab97,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[115] = {
-	.class_hid = BNXT_ULP_CLASS_HID_200fd,
+	.class_hid = BNXT_ULP_CLASS_HID_4a56b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[116] = {
-	.class_hid = BNXT_ULP_CLASS_HID_316fd,
+	.class_hid = BNXT_ULP_CLASS_HID_4b1d3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[117] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2821,
+	.class_hid = BNXT_ULP_CLASS_HID_4898b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[118] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13e21,
+	.class_hid = BNXT_ULP_CLASS_HID_495f3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[119] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25421,
+	.class_hid = BNXT_ULP_CLASS_HID_48fb7,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[120] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30d15,
+	.class_hid = BNXT_ULP_CLASS_HID_49c3f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[121] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4e41,
+	.class_hid = BNXT_ULP_CLASS_HID_4c2b3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[122] = {
-	.class_hid = BNXT_ULP_CLASS_HID_107b5,
+	.class_hid = BNXT_ULP_CLASS_HID_4cf3b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[123] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21db5,
+	.class_hid = BNXT_ULP_CLASS_HID_4c8ff,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[124] = {
-	.class_hid = BNXT_ULP_CLASS_HID_333b5,
+	.class_hid = BNXT_ULP_CLASS_HID_4d567,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[125] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2541,
+	.class_hid = BNXT_ULP_CLASS_HID_4ad1f,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[126] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b8d,
+	.class_hid = BNXT_ULP_CLASS_HID_4b987,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[127] = {
-	.class_hid = BNXT_ULP_CLASS_HID_056d,
+	.class_hid = BNXT_ULP_CLASS_HID_4b35b,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[128] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5bfd,
+	.class_hid = BNXT_ULP_CLASS_HID_4bfc3,
 	.class_tid = 1,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 25,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[129] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2691,
+	.class_hid = BNXT_ULP_CLASS_HID_1b9fb,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 25,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[130] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13c91,
+	.class_hid = BNXT_ULP_CLASS_HID_1c663,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 25,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[131] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25291,
+	.class_hid = BNXT_ULP_CLASS_HID_1c027,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 26,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[132] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30c45,
+	.class_hid = BNXT_ULP_CLASS_HID_1ccaf,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 27,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[133] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0031,
+	.class_hid = BNXT_ULP_CLASS_HID_1a447,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 28,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[134] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11631,
+	.class_hid = BNXT_ULP_CLASS_HID_1b0cf,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 28,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[135] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c31,
+	.class_hid = BNXT_ULP_CLASS_HID_1aa83,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 28,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[136] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34231,
+	.class_hid = BNXT_ULP_CLASS_HID_1b70b,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 28,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[137] = {
-	.class_hid = BNXT_ULP_CLASS_HID_53e5,
+	.class_hid = BNXT_ULP_CLASS_HID_180b3,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 28,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[138] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10ca9,
+	.class_hid = BNXT_ULP_CLASS_HID_18d3b,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 28,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[139] = {
-	.class_hid = BNXT_ULP_CLASS_HID_222a9,
+	.class_hid = BNXT_ULP_CLASS_HID_186ff,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 29,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[140] = {
-	.class_hid = BNXT_ULP_CLASS_HID_338a9,
+	.class_hid = BNXT_ULP_CLASS_HID_19367,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 30,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[141] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d09,
+	.class_hid = BNXT_ULP_CLASS_HID_1c7eb,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[142] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13309,
+	.class_hid = BNXT_ULP_CLASS_HID_1d453,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[143] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24909,
+	.class_hid = BNXT_ULP_CLASS_HID_1ce17,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[144] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3023d,
+	.class_hid = BNXT_ULP_CLASS_HID_1da9f,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[145] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20d5,
+	.class_hid = BNXT_ULP_CLASS_HID_5b52f,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[146] = {
-	.class_hid = BNXT_ULP_CLASS_HID_136d5,
+	.class_hid = BNXT_ULP_CLASS_HID_5c197,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[147] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24cd5,
+	.class_hid = BNXT_ULP_CLASS_HID_5bb6b,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[148] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30599,
+	.class_hid = BNXT_ULP_CLASS_HID_5c7d3,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[149] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5741,
+	.class_hid = BNXT_ULP_CLASS_HID_59f8b,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[150] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11075,
+	.class_hid = BNXT_ULP_CLASS_HID_5abf3,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[151] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22675,
+	.class_hid = BNXT_ULP_CLASS_HID_5a5b7,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[152] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33c75,
+	.class_hid = BNXT_ULP_CLASS_HID_5b23f,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[153] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4d39,
+	.class_hid = BNXT_ULP_CLASS_HID_5d8b3,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[154] = {
-	.class_hid = BNXT_ULP_CLASS_HID_106ed,
+	.class_hid = BNXT_ULP_CLASS_HID_5886f,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[155] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21ced,
+	.class_hid = BNXT_ULP_CLASS_HID_58223,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[156] = {
-	.class_hid = BNXT_ULP_CLASS_HID_332ed,
+	.class_hid = BNXT_ULP_CLASS_HID_58eab,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[157] = {
-	.class_hid = BNXT_ULP_CLASS_HID_174d,
+	.class_hid = BNXT_ULP_CLASS_HID_5c31f,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[158] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12d4d,
+	.class_hid = BNXT_ULP_CLASS_HID_5cf87,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[159] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2434d,
+	.class_hid = BNXT_ULP_CLASS_HID_5c95b,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[160] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3594d,
+	.class_hid = BNXT_ULP_CLASS_HID_5d5c3,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[161] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a29,
+	.class_hid = BNXT_ULP_CLASS_HID_05f1,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[162] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13029,
+	.class_hid = BNXT_ULP_CLASS_HID_1209,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 31,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[163] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24629,
+	.class_hid = BNXT_ULP_CLASS_HID_0bcd,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 32,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[164] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35c29,
+	.class_hid = BNXT_ULP_CLASS_HID_1845,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 33,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[165] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5085,
+	.class_hid = BNXT_ULP_CLASS_HID_25e9,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 34,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[166] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10a49,
+	.class_hid = BNXT_ULP_CLASS_HID_3261,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 34,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[167] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22049,
+	.class_hid = BNXT_ULP_CLASS_HID_2c25,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 34,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[168] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33649,
+	.class_hid = BNXT_ULP_CLASS_HID_38bd,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 34,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[169] = {
-	.class_hid = BNXT_ULP_CLASS_HID_477d,
+	.class_hid = BNXT_ULP_CLASS_HID_3c1d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 34,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[170] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10021,
+	.class_hid = BNXT_ULP_CLASS_HID_4895,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 34,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[171] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21621,
+	.class_hid = BNXT_ULP_CLASS_HID_4259,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 35,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[172] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32c21,
+	.class_hid = BNXT_ULP_CLASS_HID_4ed1,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 36,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[173] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1081,
+	.class_hid = BNXT_ULP_CLASS_HID_5c75,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[174] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12681,
+	.class_hid = BNXT_ULP_CLASS_HID_0bc1,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[175] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23c81,
+	.class_hid = BNXT_ULP_CLASS_HID_0585,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[176] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35281,
+	.class_hid = BNXT_ULP_CLASS_HID_121d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[177] = {
-	.class_hid = BNXT_ULP_CLASS_HID_146d,
+	.class_hid = BNXT_ULP_CLASS_HID_58c5,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[178] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12a6d,
+	.class_hid = BNXT_ULP_CLASS_HID_0891,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[179] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2406d,
+	.class_hid = BNXT_ULP_CLASS_HID_0255,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[180] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3566d,
+	.class_hid = BNXT_ULP_CLASS_HID_0eed,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[181] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4ad9,
+	.class_hid = BNXT_ULP_CLASS_HID_1c71,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[182] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1038d,
+	.class_hid = BNXT_ULP_CLASS_HID_2889,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[183] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2198d,
+	.class_hid = BNXT_ULP_CLASS_HID_224d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[184] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32f8d,
+	.class_hid = BNXT_ULP_CLASS_HID_2ec5,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[185] = {
-	.class_hid = BNXT_ULP_CLASS_HID_40b1,
+	.class_hid = BNXT_ULP_CLASS_HID_32a5,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[186] = {
-	.class_hid = BNXT_ULP_CLASS_HID_156b1,
+	.class_hid = BNXT_ULP_CLASS_HID_3f3d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[187] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21065,
+	.class_hid = BNXT_ULP_CLASS_HID_38e1,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[188] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32665,
+	.class_hid = BNXT_ULP_CLASS_HID_4579,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[189] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0ac5,
+	.class_hid = BNXT_ULP_CLASS_HID_529d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[190] = {
-	.class_hid = BNXT_ULP_CLASS_HID_120c5,
+	.class_hid = BNXT_ULP_CLASS_HID_0269,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[191] = {
-	.class_hid = BNXT_ULP_CLASS_HID_236c5,
+	.class_hid = BNXT_ULP_CLASS_HID_58d9,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[192] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34cc5,
+	.class_hid = BNXT_ULP_CLASS_HID_08a5,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[193] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0139,
+	.class_hid = BNXT_ULP_CLASS_HID_400c5,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[194] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11739,
+	.class_hid = BNXT_ULP_CLASS_HID_40d5d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 37,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20488,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[195] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22d39,
+	.class_hid = BNXT_ULP_CLASS_HID_40701,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 38,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[196] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34339,
+	.class_hid = BNXT_ULP_CLASS_HID_41399,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 39,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20488,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[197] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3795,
+	.class_hid = BNXT_ULP_CLASS_HID_4213d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 40,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[198] = {
-	.class_hid = BNXT_ULP_CLASS_HID_14d95,
+	.class_hid = BNXT_ULP_CLASS_HID_42db5,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 40,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20488,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[199] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20759,
+	.class_hid = BNXT_ULP_CLASS_HID_42779,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 40,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[200] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31d59,
+	.class_hid = BNXT_ULP_CLASS_HID_433f1,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 40,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20488,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[201] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2e0d,
+	.class_hid = BNXT_ULP_CLASS_HID_43751,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 40,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[202] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1440d,
+	.class_hid = BNXT_ULP_CLASS_HID_443e9,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 40,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22536,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[203] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25a0d,
+	.class_hid = BNXT_ULP_CLASS_HID_43dad,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 41,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[204] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31331,
+	.class_hid = BNXT_ULP_CLASS_HID_44a25,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 42,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22536,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[205] = {
-	.class_hid = BNXT_ULP_CLASS_HID_54ed,
+	.class_hid = BNXT_ULP_CLASS_HID_45749,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[206] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10d91,
+	.class_hid = BNXT_ULP_CLASS_HID_40715,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22536,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[207] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22391,
+	.class_hid = BNXT_ULP_CLASS_HID_400d9,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[208] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33991,
+	.class_hid = BNXT_ULP_CLASS_HID_40d51,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22536,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[209] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5849,
+	.class_hid = BNXT_ULP_CLASS_HID_45419,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[210] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1117d,
+	.class_hid = BNXT_ULP_CLASS_HID_403e5,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[211] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2277d,
+	.class_hid = BNXT_ULP_CLASS_HID_45a55,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[212] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33d7d,
+	.class_hid = BNXT_ULP_CLASS_HID_40a21,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[213] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31e9,
+	.class_hid = BNXT_ULP_CLASS_HID_41745,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[214] = {
-	.class_hid = BNXT_ULP_CLASS_HID_147e9,
+	.class_hid = BNXT_ULP_CLASS_HID_423dd,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[215] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2009d,
+	.class_hid = BNXT_ULP_CLASS_HID_41d81,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[216] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3169d,
+	.class_hid = BNXT_ULP_CLASS_HID_42a19,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[217] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2841,
+	.class_hid = BNXT_ULP_CLASS_HID_42df9,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[218] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13e41,
+	.class_hid = BNXT_ULP_CLASS_HID_43a71,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30728,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[219] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25441,
+	.class_hid = BNXT_ULP_CLASS_HID_43435,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[220] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30d75,
+	.class_hid = BNXT_ULP_CLASS_HID_4404d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30728,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[221] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4e21,
+	.class_hid = BNXT_ULP_CLASS_HID_44dd1,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[222] = {
-	.class_hid = BNXT_ULP_CLASS_HID_107d5,
+	.class_hid = BNXT_ULP_CLASS_HID_45a69,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30728,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[223] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21dd5,
+	.class_hid = BNXT_ULP_CLASS_HID_4542d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[224] = {
-	.class_hid = BNXT_ULP_CLASS_HID_333d5,
+	.class_hid = BNXT_ULP_CLASS_HID_403f9,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30728,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[225] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2521,
+	.class_hid = BNXT_ULP_CLASS_HID_4140d,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[226] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bed,
+	.class_hid = BNXT_ULP_CLASS_HID_420b5,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16392,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[227] = {
-	.class_hid = BNXT_ULP_CLASS_HID_050d,
+	.class_hid = BNXT_ULP_CLASS_HID_41a49,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[228] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5b9d,
+	.class_hid = BNXT_ULP_CLASS_HID_426f1,
 	.class_tid = 1,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 43,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16392,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[229] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1865,
+	.class_hid = BNXT_ULP_CLASS_HID_44ab9,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 43,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[230] = {
-	.class_hid = BNXT_ULP_CLASS_HID_389d,
+	.class_hid = BNXT_ULP_CLASS_HID_45721,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 44,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16392,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[231] = {
-	.class_hid = BNXT_ULP_CLASS_HID_123d,
+	.class_hid = BNXT_ULP_CLASS_HID_450e5,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 44,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[232] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4ef1,
+	.class_hid = BNXT_ULP_CLASS_HID_40051,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 45,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16392,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[233] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1229,
+	.class_hid = BNXT_ULP_CLASS_HID_40aa5,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 45,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[234] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3241,
+	.class_hid = BNXT_ULP_CLASS_HID_4172d,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 45,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[235] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0be1,
+	.class_hid = BNXT_ULP_CLASS_HID_410e1,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 45,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[236] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48b5,
+	.class_hid = BNXT_ULP_CLASS_HID_41d69,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 45,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[237] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0bed,
+	.class_hid = BNXT_ULP_CLASS_HID_440d1,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 45,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[238] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c05,
+	.class_hid = BNXT_ULP_CLASS_HID_44d59,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 46,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[239] = {
-	.class_hid = BNXT_ULP_CLASS_HID_05a5,
+	.class_hid = BNXT_ULP_CLASS_HID_4471d,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 46,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[240] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4279,
+	.class_hid = BNXT_ULP_CLASS_HID_45385,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 47,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[241] = {
-	.class_hid = BNXT_ULP_CLASS_HID_05d1,
+	.class_hid = BNXT_ULP_CLASS_HID_6400d,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 47,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[242] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25c9,
+	.class_hid = BNXT_ULP_CLASS_HID_64cb5,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 47,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[243] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5c55,
+	.class_hid = BNXT_ULP_CLASS_HID_64649,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 47,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[244] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c3d,
+	.class_hid = BNXT_ULP_CLASS_HID_652f1,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 47,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[245] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4fc9,
+	.class_hid = BNXT_ULP_CLASS_HID_619ed,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 47,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[246] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1335,
+	.class_hid = BNXT_ULP_CLASS_HID_62615,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 48,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49160,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[247] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4981,
+	.class_hid = BNXT_ULP_CLASS_HID_62029,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 48,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[248] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2969,
+	.class_hid = BNXT_ULP_CLASS_HID_62c51,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 49,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49160,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[249] = {
-	.class_hid = BNXT_ULP_CLASS_HID_498d,
+	.class_hid = BNXT_ULP_CLASS_HID_636a5,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 49,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[250] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0cf9,
+	.class_hid = BNXT_ULP_CLASS_HID_6432d,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 49,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57352,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[251] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4345,
+	.class_hid = BNXT_ULP_CLASS_HID_63ce1,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 49,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[252] = {
-	.class_hid = BNXT_ULP_CLASS_HID_232d,
+	.class_hid = BNXT_ULP_CLASS_HID_64969,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 49,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57352,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[253] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2579,
+	.class_hid = BNXT_ULP_CLASS_HID_61005,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 49,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[254] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bb5,
+	.class_hid = BNXT_ULP_CLASS_HID_61c8d,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 49,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57352,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[255] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4bad,
+	.class_hid = BNXT_ULP_CLASS_HID_61641,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 49,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[256] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4591,
+	.class_hid = BNXT_ULP_CLASS_HID_622c9,
 	.class_tid = 1,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 49,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57352,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[257] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1845,
+	.class_hid = BNXT_ULP_CLASS_HID_52a0d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 49,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[258] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1399,
+	.class_hid = BNXT_ULP_CLASS_HID_536b5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 49,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81928,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[259] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0eed,
+	.class_hid = BNXT_ULP_CLASS_HID_53049,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 50,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[260] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0a21,
+	.class_hid = BNXT_ULP_CLASS_HID_53cf1,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 51,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81928,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[261] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38bd,
+	.class_hid = BNXT_ULP_CLASS_HID_503ed,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 52,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[262] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33f1,
+	.class_hid = BNXT_ULP_CLASS_HID_51015,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 52,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81928,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[263] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ec5,
+	.class_hid = BNXT_ULP_CLASS_HID_50a29,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 52,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[264] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a19,
+	.class_hid = BNXT_ULP_CLASS_HID_51651,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 52,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81928,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[265] = {
-	.class_hid = BNXT_ULP_CLASS_HID_121d,
+	.class_hid = BNXT_ULP_CLASS_HID_520a5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 52,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[266] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0d51,
+	.class_hid = BNXT_ULP_CLASS_HID_52d2d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 52,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90120,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[267] = {
-	.class_hid = BNXT_ULP_CLASS_HID_08a5,
+	.class_hid = BNXT_ULP_CLASS_HID_526e1,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 53,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[268] = {
-	.class_hid = BNXT_ULP_CLASS_HID_03f9,
+	.class_hid = BNXT_ULP_CLASS_HID_53369,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 54,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90120,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[269] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4ed1,
+	.class_hid = BNXT_ULP_CLASS_HID_556d1,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[270] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a25,
+	.class_hid = BNXT_ULP_CLASS_HID_5068d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90120,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[271] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4579,
+	.class_hid = BNXT_ULP_CLASS_HID_50041,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[272] = {
-	.class_hid = BNXT_ULP_CLASS_HID_404d,
+	.class_hid = BNXT_ULP_CLASS_HID_50cc9,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90120,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[273] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1209,
+	.class_hid = BNXT_ULP_CLASS_HID_7560d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[274] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0d5d,
+	.class_hid = BNXT_ULP_CLASS_HID_705f9,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[275] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0891,
+	.class_hid = BNXT_ULP_CLASS_HID_75c49,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[276] = {
-	.class_hid = BNXT_ULP_CLASS_HID_03e5,
+	.class_hid = BNXT_ULP_CLASS_HID_70c25,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[277] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3261,
+	.class_hid = BNXT_ULP_CLASS_HID_72fed,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[278] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2db5,
+	.class_hid = BNXT_ULP_CLASS_HID_73c15,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[279] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2889,
+	.class_hid = BNXT_ULP_CLASS_HID_73629,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[280] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23dd,
+	.class_hid = BNXT_ULP_CLASS_HID_74251,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[281] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0bc1,
+	.class_hid = BNXT_ULP_CLASS_HID_74ca5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[282] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0715,
+	.class_hid = BNXT_ULP_CLASS_HID_7592d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122888,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[283] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0269,
+	.class_hid = BNXT_ULP_CLASS_HID_752e1,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[284] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5a69,
+	.class_hid = BNXT_ULP_CLASS_HID_7025d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122888,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[285] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4895,
+	.class_hid = BNXT_ULP_CLASS_HID_72605,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[286] = {
-	.class_hid = BNXT_ULP_CLASS_HID_43e9,
+	.class_hid = BNXT_ULP_CLASS_HID_7328d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122888,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[287] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3f3d,
+	.class_hid = BNXT_ULP_CLASS_HID_72c41,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[288] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a71,
+	.class_hid = BNXT_ULP_CLASS_HID_738c9,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122888,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[289] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0bcd,
+	.class_hid = BNXT_ULP_CLASS_HID_0591,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[290] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0701,
+	.class_hid = BNXT_ULP_CLASS_HID_1269,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 55,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[291] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0255,
+	.class_hid = BNXT_ULP_CLASS_HID_0bad,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 56,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[292] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5a55,
+	.class_hid = BNXT_ULP_CLASS_HID_1825,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 57,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[293] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c25,
+	.class_hid = BNXT_ULP_CLASS_HID_2589,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 58,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[294] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2779,
+	.class_hid = BNXT_ULP_CLASS_HID_3201,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 58,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[295] = {
-	.class_hid = BNXT_ULP_CLASS_HID_224d,
+	.class_hid = BNXT_ULP_CLASS_HID_2c45,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 58,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[296] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d81,
+	.class_hid = BNXT_ULP_CLASS_HID_38dd,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 58,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[297] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0585,
+	.class_hid = BNXT_ULP_CLASS_HID_3c7d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 58,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[298] = {
-	.class_hid = BNXT_ULP_CLASS_HID_00d9,
+	.class_hid = BNXT_ULP_CLASS_HID_48f5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 58,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[299] = {
-	.class_hid = BNXT_ULP_CLASS_HID_58d9,
+	.class_hid = BNXT_ULP_CLASS_HID_4239,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 59,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[300] = {
-	.class_hid = BNXT_ULP_CLASS_HID_542d,
+	.class_hid = BNXT_ULP_CLASS_HID_4eb1,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 60,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[301] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4259,
+	.class_hid = BNXT_ULP_CLASS_HID_5c15,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[302] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dad,
+	.class_hid = BNXT_ULP_CLASS_HID_0ba1,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[303] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38e1,
+	.class_hid = BNXT_ULP_CLASS_HID_05e5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[304] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3435,
+	.class_hid = BNXT_ULP_CLASS_HID_127d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[305] = {
-	.class_hid = BNXT_ULP_CLASS_HID_05f1,
+	.class_hid = BNXT_ULP_CLASS_HID_58a5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[306] = {
-	.class_hid = BNXT_ULP_CLASS_HID_00c5,
+	.class_hid = BNXT_ULP_CLASS_HID_08f1,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[307] = {
-	.class_hid = BNXT_ULP_CLASS_HID_58c5,
+	.class_hid = BNXT_ULP_CLASS_HID_0235,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[308] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5419,
+	.class_hid = BNXT_ULP_CLASS_HID_0e8d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[309] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25e9,
+	.class_hid = BNXT_ULP_CLASS_HID_1c11,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[310] = {
-	.class_hid = BNXT_ULP_CLASS_HID_213d,
+	.class_hid = BNXT_ULP_CLASS_HID_28e9,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[311] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c71,
+	.class_hid = BNXT_ULP_CLASS_HID_222d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[312] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1745,
+	.class_hid = BNXT_ULP_CLASS_HID_2ea5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[313] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5c75,
+	.class_hid = BNXT_ULP_CLASS_HID_32c5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[314] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5749,
+	.class_hid = BNXT_ULP_CLASS_HID_3f5d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[315] = {
-	.class_hid = BNXT_ULP_CLASS_HID_529d,
+	.class_hid = BNXT_ULP_CLASS_HID_3881,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[316] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4dd1,
+	.class_hid = BNXT_ULP_CLASS_HID_4519,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[317] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c1d,
+	.class_hid = BNXT_ULP_CLASS_HID_52fd,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[318] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3751,
+	.class_hid = BNXT_ULP_CLASS_HID_0209,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[319] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32a5,
+	.class_hid = BNXT_ULP_CLASS_HID_58b9,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[320] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2df9,
+	.class_hid = BNXT_ULP_CLASS_HID_08c5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[321] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4fe9,
+	.class_hid = BNXT_ULP_CLASS_HID_400a5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[322] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4b3d,
+	.class_hid = BNXT_ULP_CLASS_HID_40d3d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 61,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20488,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[323] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4671,
+	.class_hid = BNXT_ULP_CLASS_HID_40761,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 62,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[324] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4145,
+	.class_hid = BNXT_ULP_CLASS_HID_413f9,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 63,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20488,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[325] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1315,
+	.class_hid = BNXT_ULP_CLASS_HID_4215d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 64,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[326] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0e69,
+	.class_hid = BNXT_ULP_CLASS_HID_42dd5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 64,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20488,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[327] = {
-	.class_hid = BNXT_ULP_CLASS_HID_09bd,
+	.class_hid = BNXT_ULP_CLASS_HID_42719,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 64,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[328] = {
-	.class_hid = BNXT_ULP_CLASS_HID_04f1,
+	.class_hid = BNXT_ULP_CLASS_HID_43391,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 64,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20488,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[329] = {
-	.class_hid = BNXT_ULP_CLASS_HID_49a1,
+	.class_hid = BNXT_ULP_CLASS_HID_43731,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 64,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[330] = {
-	.class_hid = BNXT_ULP_CLASS_HID_44f5,
+	.class_hid = BNXT_ULP_CLASS_HID_44389,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 64,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22536,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[331] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3fc9,
+	.class_hid = BNXT_ULP_CLASS_HID_43dcd,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 65,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[332] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b1d,
+	.class_hid = BNXT_ULP_CLASS_HID_44a45,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 66,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22536,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[333] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2949,
+	.class_hid = BNXT_ULP_CLASS_HID_45729,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[334] = {
-	.class_hid = BNXT_ULP_CLASS_HID_249d,
+	.class_hid = BNXT_ULP_CLASS_HID_40775,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22536,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[335] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fd1,
+	.class_hid = BNXT_ULP_CLASS_HID_400b9,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[336] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b25,
+	.class_hid = BNXT_ULP_CLASS_HID_40d31,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22536,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[337] = {
-	.class_hid = BNXT_ULP_CLASS_HID_49ad,
+	.class_hid = BNXT_ULP_CLASS_HID_45479,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[338] = {
-	.class_hid = BNXT_ULP_CLASS_HID_44e1,
+	.class_hid = BNXT_ULP_CLASS_HID_40385,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[339] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4035,
+	.class_hid = BNXT_ULP_CLASS_HID_45a35,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[340] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b09,
+	.class_hid = BNXT_ULP_CLASS_HID_40a41,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[341] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0cd9,
+	.class_hid = BNXT_ULP_CLASS_HID_41725,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[342] = {
-	.class_hid = BNXT_ULP_CLASS_HID_082d,
+	.class_hid = BNXT_ULP_CLASS_HID_423bd,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[343] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0361,
+	.class_hid = BNXT_ULP_CLASS_HID_41de1,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[344] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5b61,
+	.class_hid = BNXT_ULP_CLASS_HID_42a79,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[345] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4365,
+	.class_hid = BNXT_ULP_CLASS_HID_42d99,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[346] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3eb9,
+	.class_hid = BNXT_ULP_CLASS_HID_43a11,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30728,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[347] = {
-	.class_hid = BNXT_ULP_CLASS_HID_398d,
+	.class_hid = BNXT_ULP_CLASS_HID_43455,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[348] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34c1,
+	.class_hid = BNXT_ULP_CLASS_HID_4402d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30728,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[349] = {
-	.class_hid = BNXT_ULP_CLASS_HID_230d,
+	.class_hid = BNXT_ULP_CLASS_HID_44db1,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[350] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e41,
+	.class_hid = BNXT_ULP_CLASS_HID_45a09,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30728,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[351] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1995,
+	.class_hid = BNXT_ULP_CLASS_HID_4544d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[352] = {
-	.class_hid = BNXT_ULP_CLASS_HID_14e9,
+	.class_hid = BNXT_ULP_CLASS_HID_40399,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30728,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[353] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2559,
+	.class_hid = BNXT_ULP_CLASS_HID_4146d,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[354] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b95,
+	.class_hid = BNXT_ULP_CLASS_HID_420d5,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16392,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[355] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4b8d,
+	.class_hid = BNXT_ULP_CLASS_HID_41a29,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[356] = {
-	.class_hid = BNXT_ULP_CLASS_HID_45b1,
+	.class_hid = BNXT_ULP_CLASS_HID_42691,
 	.class_tid = 1,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 67,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16392,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[357] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1825,
+	.class_hid = BNXT_ULP_CLASS_HID_44ad9,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 67,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[358] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13f9,
+	.class_hid = BNXT_ULP_CLASS_HID_45741,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 67,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16392,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[359] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0e8d,
+	.class_hid = BNXT_ULP_CLASS_HID_45085,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 68,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
-	},
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
 	[360] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0a41,
+	.class_hid = BNXT_ULP_CLASS_HID_40031,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 69,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16392,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[361] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38dd,
+	.class_hid = BNXT_ULP_CLASS_HID_40ac5,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 70,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[362] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3391,
+	.class_hid = BNXT_ULP_CLASS_HID_4174d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 70,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[363] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ea5,
+	.class_hid = BNXT_ULP_CLASS_HID_41081,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 70,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[364] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a79,
+	.class_hid = BNXT_ULP_CLASS_HID_41d09,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 70,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[365] = {
-	.class_hid = BNXT_ULP_CLASS_HID_127d,
+	.class_hid = BNXT_ULP_CLASS_HID_440b1,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 70,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[366] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0d31,
+	.class_hid = BNXT_ULP_CLASS_HID_44d39,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 70,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[367] = {
-	.class_hid = BNXT_ULP_CLASS_HID_08c5,
+	.class_hid = BNXT_ULP_CLASS_HID_4477d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 71,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[368] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0399,
+	.class_hid = BNXT_ULP_CLASS_HID_453e5,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 72,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24584,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[369] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4eb1,
+	.class_hid = BNXT_ULP_CLASS_HID_6406d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[370] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a45,
+	.class_hid = BNXT_ULP_CLASS_HID_64cd5,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[371] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4519,
+	.class_hid = BNXT_ULP_CLASS_HID_64629,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[372] = {
-	.class_hid = BNXT_ULP_CLASS_HID_402d,
+	.class_hid = BNXT_ULP_CLASS_HID_65291,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[373] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1269,
+	.class_hid = BNXT_ULP_CLASS_HID_6198d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[374] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0d3d,
+	.class_hid = BNXT_ULP_CLASS_HID_62675,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[375] = {
-	.class_hid = BNXT_ULP_CLASS_HID_08f1,
+	.class_hid = BNXT_ULP_CLASS_HID_62049,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[376] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0385,
+	.class_hid = BNXT_ULP_CLASS_HID_62c31,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[377] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3201,
+	.class_hid = BNXT_ULP_CLASS_HID_636c5,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[378] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dd5,
+	.class_hid = BNXT_ULP_CLASS_HID_6434d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57352,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[379] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28e9,
+	.class_hid = BNXT_ULP_CLASS_HID_63c81,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[380] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23bd,
+	.class_hid = BNXT_ULP_CLASS_HID_64909,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57352,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[381] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0ba1,
+	.class_hid = BNXT_ULP_CLASS_HID_61065,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[382] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0775,
+	.class_hid = BNXT_ULP_CLASS_HID_61ced,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57352,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[383] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0209,
+	.class_hid = BNXT_ULP_CLASS_HID_61621,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[384] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5a09,
+	.class_hid = BNXT_ULP_CLASS_HID_622a9,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57352,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[385] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48f5,
+	.class_hid = BNXT_ULP_CLASS_HID_52a6d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[386] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4389,
+	.class_hid = BNXT_ULP_CLASS_HID_536d5,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81928,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[387] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3f5d,
+	.class_hid = BNXT_ULP_CLASS_HID_53029,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[388] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a11,
+	.class_hid = BNXT_ULP_CLASS_HID_53c91,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81928,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[389] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0bad,
+	.class_hid = BNXT_ULP_CLASS_HID_5038d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[390] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0761,
+	.class_hid = BNXT_ULP_CLASS_HID_51075,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 73,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81928,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[391] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0235,
+	.class_hid = BNXT_ULP_CLASS_HID_50a49,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 74,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[392] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5a35,
+	.class_hid = BNXT_ULP_CLASS_HID_51631,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 75,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81928,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[393] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c45,
+	.class_hid = BNXT_ULP_CLASS_HID_520c5,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 76,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[394] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2719,
+	.class_hid = BNXT_ULP_CLASS_HID_52d4d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 76,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90120,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[395] = {
-	.class_hid = BNXT_ULP_CLASS_HID_222d,
+	.class_hid = BNXT_ULP_CLASS_HID_52681,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 76,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[396] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1de1,
+	.class_hid = BNXT_ULP_CLASS_HID_53309,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 76,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90120,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[397] = {
-	.class_hid = BNXT_ULP_CLASS_HID_05e5,
+	.class_hid = BNXT_ULP_CLASS_HID_556b1,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 76,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[398] = {
-	.class_hid = BNXT_ULP_CLASS_HID_00b9,
+	.class_hid = BNXT_ULP_CLASS_HID_506ed,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 76,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90120,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[399] = {
-	.class_hid = BNXT_ULP_CLASS_HID_58b9,
+	.class_hid = BNXT_ULP_CLASS_HID_50021,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 77,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[400] = {
-	.class_hid = BNXT_ULP_CLASS_HID_544d,
+	.class_hid = BNXT_ULP_CLASS_HID_50ca9,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 78,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90120,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[401] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4239,
+	.class_hid = BNXT_ULP_CLASS_HID_7566d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[402] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dcd,
+	.class_hid = BNXT_ULP_CLASS_HID_70599,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[403] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3881,
+	.class_hid = BNXT_ULP_CLASS_HID_75c29,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[404] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3455,
+	.class_hid = BNXT_ULP_CLASS_HID_70c45,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[405] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0591,
+	.class_hid = BNXT_ULP_CLASS_HID_72f8d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[406] = {
-	.class_hid = BNXT_ULP_CLASS_HID_00a5,
+	.class_hid = BNXT_ULP_CLASS_HID_73c75,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[407] = {
-	.class_hid = BNXT_ULP_CLASS_HID_58a5,
+	.class_hid = BNXT_ULP_CLASS_HID_73649,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[408] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5479,
+	.class_hid = BNXT_ULP_CLASS_HID_74231,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[409] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2589,
+	.class_hid = BNXT_ULP_CLASS_HID_74cc5,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[410] = {
-	.class_hid = BNXT_ULP_CLASS_HID_215d,
+	.class_hid = BNXT_ULP_CLASS_HID_7594d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122888,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[411] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c11,
+	.class_hid = BNXT_ULP_CLASS_HID_75281,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[412] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1725,
+	.class_hid = BNXT_ULP_CLASS_HID_7023d,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122888,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[413] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5c15,
+	.class_hid = BNXT_ULP_CLASS_HID_72665,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[414] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5729,
+	.class_hid = BNXT_ULP_CLASS_HID_732ed,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122888,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[415] = {
-	.class_hid = BNXT_ULP_CLASS_HID_52fd,
+	.class_hid = BNXT_ULP_CLASS_HID_72c21,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[416] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4db1,
+	.class_hid = BNXT_ULP_CLASS_HID_738a9,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122888,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[417] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c7d,
+	.class_hid = BNXT_ULP_CLASS_HID_244c3,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[418] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3731,
+	.class_hid = BNXT_ULP_CLASS_HID_2515b,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[419] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32c5,
+	.class_hid = BNXT_ULP_CLASS_HID_24b1f,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[420] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d99,
+	.class_hid = BNXT_ULP_CLASS_HID_25797,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[421] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4f89,
+	.class_hid = BNXT_ULP_CLASS_HID_22f7f,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[422] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4b5d,
+	.class_hid = BNXT_ULP_CLASS_HID_23bf7,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 79,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[423] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4611,
+	.class_hid = BNXT_ULP_CLASS_HID_235bb,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 80,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[424] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4125,
+	.class_hid = BNXT_ULP_CLASS_HID_24233,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 81,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[425] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1375,
+	.class_hid = BNXT_ULP_CLASS_HID_20b8b,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 82,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[426] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0e09,
+	.class_hid = BNXT_ULP_CLASS_HID_21803,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 82,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32776,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[427] = {
-	.class_hid = BNXT_ULP_CLASS_HID_09dd,
+	.class_hid = BNXT_ULP_CLASS_HID_211c7,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 82,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[428] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0491,
+	.class_hid = BNXT_ULP_CLASS_HID_21e5f,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 82,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32776,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[429] = {
-	.class_hid = BNXT_ULP_CLASS_HID_49c1,
+	.class_hid = BNXT_ULP_CLASS_HID_252d3,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 82,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[430] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4495,
+	.class_hid = BNXT_ULP_CLASS_HID_202bf,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 82,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[431] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3fa9,
+	.class_hid = BNXT_ULP_CLASS_HID_2592f,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 83,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[432] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b7d,
+	.class_hid = BNXT_ULP_CLASS_HID_208fb,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 84,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[433] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2929,
+	.class_hid = BNXT_ULP_CLASS_HID_231f3,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[434] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24fd,
+	.class_hid = BNXT_ULP_CLASS_HID_23e0b,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32776,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[435] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fb1,
+	.class_hid = BNXT_ULP_CLASS_HID_237cf,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[436] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b45,
+	.class_hid = BNXT_ULP_CLASS_HID_24447,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32776,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[437] = {
-	.class_hid = BNXT_ULP_CLASS_HID_49cd,
+	.class_hid = BNXT_ULP_CLASS_HID_21c2f,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[438] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4481,
+	.class_hid = BNXT_ULP_CLASS_HID_228a7,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[439] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4055,
+	.class_hid = BNXT_ULP_CLASS_HID_2226b,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[440] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b69,
+	.class_hid = BNXT_ULP_CLASS_HID_22ee3,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[441] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0cb9,
+	.class_hid = BNXT_ULP_CLASS_HID_25567,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[442] = {
-	.class_hid = BNXT_ULP_CLASS_HID_084d,
+	.class_hid = BNXT_ULP_CLASS_HID_20533,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32776,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[443] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0301,
+	.class_hid = BNXT_ULP_CLASS_HID_25ba3,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[444] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5b01,
+	.class_hid = BNXT_ULP_CLASS_HID_20b0f,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32776,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[445] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4305,
+	.class_hid = BNXT_ULP_CLASS_HID_23f83,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[446] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ed9,
+	.class_hid = BNXT_ULP_CLASS_HID_24c1b,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[447] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39ed,
+	.class_hid = BNXT_ULP_CLASS_HID_245df,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[448] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34a1,
+	.class_hid = BNXT_ULP_CLASS_HID_25257,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[449] = {
-	.class_hid = BNXT_ULP_CLASS_HID_236d,
+	.class_hid = BNXT_ULP_CLASS_HID_64017,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[450] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e21,
+	.class_hid = BNXT_ULP_CLASS_HID_64caf,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49160,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[451] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19f5,
+	.class_hid = BNXT_ULP_CLASS_HID_64653,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[452] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1489,
+	.class_hid = BNXT_ULP_CLASS_HID_652eb,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49160,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[453] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2539,
+	.class_hid = BNXT_ULP_CLASS_HID_62ab3,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[454] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bf5,
+	.class_hid = BNXT_ULP_CLASS_HID_636cb,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[455] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4bed,
+	.class_hid = BNXT_ULP_CLASS_HID_6308f,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[456] = {
-	.class_hid = BNXT_ULP_CLASS_HID_45d1,
+	.class_hid = BNXT_ULP_CLASS_HID_63d07,
 	.class_tid = 1,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 85,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[457] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b6af,
+	.class_hid = BNXT_ULP_CLASS_HID_606df,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 85,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[458] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b1d3,
+	.class_hid = BNXT_ULP_CLASS_HID_61357,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 85,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[459] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c7d3,
+	.class_hid = BNXT_ULP_CLASS_HID_60d1b,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 85,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[460] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ccaf,
+	.class_hid = BNXT_ULP_CLASS_HID_61993,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 85,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[461] = {
-	.class_hid = BNXT_ULP_CLASS_HID_da33,
+	.class_hid = BNXT_ULP_CLASS_HID_64e27,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 85,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[462] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d567,
+	.class_hid = BNXT_ULP_CLASS_HID_65abf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 85,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[463] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18eab,
+	.class_hid = BNXT_ULP_CLASS_HID_65463,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 85,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[464] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19367,
+	.class_hid = BNXT_ULP_CLASS_HID_603cf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 85,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[465] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a10b,
+	.class_hid = BNXT_ULP_CLASS_HID_62cc7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 85,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[466] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9c3f,
+	.class_hid = BNXT_ULP_CLASS_HID_6395f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 86,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[467] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b23f,
+	.class_hid = BNXT_ULP_CLASS_HID_63303,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 86,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[468] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b70b,
+	.class_hid = BNXT_ULP_CLASS_HID_63f9b,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[469] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c49f,
+	.class_hid = BNXT_ULP_CLASS_HID_61763,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[470] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bfc3,
+	.class_hid = BNXT_ULP_CLASS_HID_623fb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[471] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d5c3,
+	.class_hid = BNXT_ULP_CLASS_HID_61dbf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[472] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1da9f,
+	.class_hid = BNXT_ULP_CLASS_HID_62a37,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[473] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b063,
+	.class_hid = BNXT_ULP_CLASS_HID_650bb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[474] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ab97,
+	.class_hid = BNXT_ULP_CLASS_HID_60007,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[475] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c197,
+	.class_hid = BNXT_ULP_CLASS_HID_656f7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[476] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c663,
+	.class_hid = BNXT_ULP_CLASS_HID_60643,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[477] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d3f7,
+	.class_hid = BNXT_ULP_CLASS_HID_63ad7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[478] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cf3b,
+	.class_hid = BNXT_ULP_CLASS_HID_6476f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[479] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1886f,
+	.class_hid = BNXT_ULP_CLASS_HID_64113,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[480] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18d3b,
+	.class_hid = BNXT_ULP_CLASS_HID_64dab,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[481] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9acf,
+	.class_hid = BNXT_ULP_CLASS_HID_35ac3,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[482] = {
-	.class_hid = BNXT_ULP_CLASS_HID_95f3,
+	.class_hid = BNXT_ULP_CLASS_HID_30aaf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[483] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1abf3,
+	.class_hid = BNXT_ULP_CLASS_HID_30453,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[484] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b0cf,
+	.class_hid = BNXT_ULP_CLASS_HID_310eb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[485] = {
-	.class_hid = BNXT_ULP_CLASS_HID_be53,
+	.class_hid = BNXT_ULP_CLASS_HID_3457f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[486] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b987,
+	.class_hid = BNXT_ULP_CLASS_HID_351f7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[487] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cf87,
+	.class_hid = BNXT_ULP_CLASS_HID_34bbb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[488] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d453,
+	.class_hid = BNXT_ULP_CLASS_HID_35833,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[489] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aa27,
+	.class_hid = BNXT_ULP_CLASS_HID_3218b,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[490] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a56b,
+	.class_hid = BNXT_ULP_CLASS_HID_32e03,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[491] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bb6b,
+	.class_hid = BNXT_ULP_CLASS_HID_327c7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[492] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c027,
+	.class_hid = BNXT_ULP_CLASS_HID_3345f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[493] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cdcb,
+	.class_hid = BNXT_ULP_CLASS_HID_30c27,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[494] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c8ff,
+	.class_hid = BNXT_ULP_CLASS_HID_318bf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[495] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18223,
+	.class_hid = BNXT_ULP_CLASS_HID_31263,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[496] = {
-	.class_hid = BNXT_ULP_CLASS_HID_186ff,
+	.class_hid = BNXT_ULP_CLASS_HID_31efb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
-	},
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
 	[497] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9483,
+	.class_hid = BNXT_ULP_CLASS_HID_347f3,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 87,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[498] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8fb7,
+	.class_hid = BNXT_ULP_CLASS_HID_3540b,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 88,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[499] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a5b7,
+	.class_hid = BNXT_ULP_CLASS_HID_34dcf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 88,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[500] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1aa83,
+	.class_hid = BNXT_ULP_CLASS_HID_35a47,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[501] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b817,
+	.class_hid = BNXT_ULP_CLASS_HID_3322f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[502] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b35b,
+	.class_hid = BNXT_ULP_CLASS_HID_33ea7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[503] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c95b,
+	.class_hid = BNXT_ULP_CLASS_HID_3386b,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[504] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ce17,
+	.class_hid = BNXT_ULP_CLASS_HID_344e3,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[505] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a3fb,
+	.class_hid = BNXT_ULP_CLASS_HID_30ebb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[506] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9f2f,
+	.class_hid = BNXT_ULP_CLASS_HID_31b33,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[507] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b52f,
+	.class_hid = BNXT_ULP_CLASS_HID_314f7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[508] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b9fb,
+	.class_hid = BNXT_ULP_CLASS_HID_3210f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[509] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c78f,
+	.class_hid = BNXT_ULP_CLASS_HID_35583,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[510] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c2b3,
+	.class_hid = BNXT_ULP_CLASS_HID_3056f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[511] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d8b3,
+	.class_hid = BNXT_ULP_CLASS_HID_35bdf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[512] = {
-	.class_hid = BNXT_ULP_CLASS_HID_180b3,
+	.class_hid = BNXT_ULP_CLASS_HID_30bab,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[513] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8e47,
+	.class_hid = BNXT_ULP_CLASS_HID_75617,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[514] = {
-	.class_hid = BNXT_ULP_CLASS_HID_898b,
+	.class_hid = BNXT_ULP_CLASS_HID_705e3,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[515] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19f8b,
+	.class_hid = BNXT_ULP_CLASS_HID_75c53,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[516] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a447,
+	.class_hid = BNXT_ULP_CLASS_HID_70c3f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[517] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b1eb,
+	.class_hid = BNXT_ULP_CLASS_HID_740b3,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[518] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ad1f,
+	.class_hid = BNXT_ULP_CLASS_HID_74ccb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[519] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c31f,
+	.class_hid = BNXT_ULP_CLASS_HID_7468f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[520] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c7eb,
+	.class_hid = BNXT_ULP_CLASS_HID_75307,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[521] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9137,
+	.class_hid = BNXT_ULP_CLASS_HID_71cdf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[522] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8c7b,
+	.class_hid = BNXT_ULP_CLASS_HID_72957,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114696,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[523] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a27b,
+	.class_hid = BNXT_ULP_CLASS_HID_7231b,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[524] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a737,
+	.class_hid = BNXT_ULP_CLASS_HID_72f93,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114696,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[525] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b4db,
+	.class_hid = BNXT_ULP_CLASS_HID_7077b,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[526] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b00f,
+	.class_hid = BNXT_ULP_CLASS_HID_713f3,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[527] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c60f,
+	.class_hid = BNXT_ULP_CLASS_HID_70db7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[528] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cadb,
+	.class_hid = BNXT_ULP_CLASS_HID_719cf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[529] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8b0b,
+	.class_hid = BNXT_ULP_CLASS_HID_742c7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[530] = {
-	.class_hid = BNXT_ULP_CLASS_HID_863f,
+	.class_hid = BNXT_ULP_CLASS_HID_74f5f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114696,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[531] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19c3f,
+	.class_hid = BNXT_ULP_CLASS_HID_74903,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[532] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a10b,
+	.class_hid = BNXT_ULP_CLASS_HID_7559b,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114696,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[533] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ae9f,
+	.class_hid = BNXT_ULP_CLASS_HID_72d63,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[534] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a9c3,
+	.class_hid = BNXT_ULP_CLASS_HID_739fb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[535] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bfc3,
+	.class_hid = BNXT_ULP_CLASS_HID_733bf,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[536] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c49f,
+	.class_hid = BNXT_ULP_CLASS_HID_74037,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[537] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2563,
+	.class_hid = BNXT_ULP_CLASS_HID_7098f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[538] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2baf,
+	.class_hid = BNXT_ULP_CLASS_HID_71607,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114696,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[539] = {
-	.class_hid = BNXT_ULP_CLASS_HID_26d3,
+	.class_hid = BNXT_ULP_CLASS_HID_70fcb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[540] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4f33,
+	.class_hid = BNXT_ULP_CLASS_HID_71c43,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114696,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[541] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a67,
+	.class_hid = BNXT_ULP_CLASS_HID_750d7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[542] = {
-	.class_hid = BNXT_ULP_CLASS_HID_160b,
+	.class_hid = BNXT_ULP_CLASS_HID_700a3,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 89,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
-	},
-	[543] = {
-	.class_hid = BNXT_ULP_CLASS_HID_113f,
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[543] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75713,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[544] = {
-	.class_hid = BNXT_ULP_CLASS_HID_399f,
+	.class_hid = BNXT_ULP_CLASS_HID_706ff,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[545] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34c3,
+	.class_hid = BNXT_ULP_CLASS_HID_2cfc3,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[546] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2097,
+	.class_hid = BNXT_ULP_CLASS_HID_2dc5b,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163848,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[547] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48f7,
+	.class_hid = BNXT_ULP_CLASS_HID_2d61f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[548] = {
-	.class_hid = BNXT_ULP_CLASS_HID_443b,
+	.class_hid = BNXT_ULP_CLASS_HID_285eb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163848,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[549] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0fcf,
+	.class_hid = BNXT_ULP_CLASS_HID_2ba7f,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[550] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0af3,
+	.class_hid = BNXT_ULP_CLASS_HID_2c6f7,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163912,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[551] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3353,
+	.class_hid = BNXT_ULP_CLASS_HID_2c0bb,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[552] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2e87,
+	.class_hid = BNXT_ULP_CLASS_HID_2cd33,
 	.class_tid = 1,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 90,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163912,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[553] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b68f,
+	.class_hid = BNXT_ULP_CLASS_HID_2968b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[554] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b94f,
+	.class_hid = BNXT_ULP_CLASS_HID_2a303,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[555] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fc0f,
+	.class_hid = BNXT_ULP_CLASS_HID_29cc7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[556] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fecf,
+	.class_hid = BNXT_ULP_CLASS_HID_2a95f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[557] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b1f3,
+	.class_hid = BNXT_ULP_CLASS_HID_28127,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[558] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b4b3,
+	.class_hid = BNXT_ULP_CLASS_HID_28dbf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[559] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f773,
+	.class_hid = BNXT_ULP_CLASS_HID_28763,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[560] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fa33,
+	.class_hid = BNXT_ULP_CLASS_HID_293fb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[561] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c7f3,
+	.class_hid = BNXT_ULP_CLASS_HID_2bcf3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[562] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eab3,
+	.class_hid = BNXT_ULP_CLASS_HID_2c90b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[563] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cd73,
+	.class_hid = BNXT_ULP_CLASS_HID_2c2cf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[564] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f033,
+	.class_hid = BNXT_ULP_CLASS_HID_2cf47,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[565] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cc8f,
+	.class_hid = BNXT_ULP_CLASS_HID_2a72f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[566] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ef4f,
+	.class_hid = BNXT_ULP_CLASS_HID_2b3a7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[567] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d20f,
+	.class_hid = BNXT_ULP_CLASS_HID_2ad6b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[568] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f4cf,
+	.class_hid = BNXT_ULP_CLASS_HID_2b9e3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[569] = {
-	.class_hid = BNXT_ULP_CLASS_HID_da13,
+	.class_hid = BNXT_ULP_CLASS_HID_283bb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[570] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a007,
+	.class_hid = BNXT_ULP_CLASS_HID_29033,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[571] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c2c7,
+	.class_hid = BNXT_ULP_CLASS_HID_289f7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[572] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e587,
+	.class_hid = BNXT_ULP_CLASS_HID_2960f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[573] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d547,
+	.class_hid = BNXT_ULP_CLASS_HID_2ca83,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[574] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f807,
+	.class_hid = BNXT_ULP_CLASS_HID_2d71b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[575] = {
-	.class_hid = BNXT_ULP_CLASS_HID_dac7,
+	.class_hid = BNXT_ULP_CLASS_HID_2d0df,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[576] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e0cb,
+	.class_hid = BNXT_ULP_CLASS_HID_280ab,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[577] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18e8b,
+	.class_hid = BNXT_ULP_CLASS_HID_6cb17,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[578] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b14b,
+	.class_hid = BNXT_ULP_CLASS_HID_6d7af,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[579] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d40b,
+	.class_hid = BNXT_ULP_CLASS_HID_6d153,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[580] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f6cb,
+	.class_hid = BNXT_ULP_CLASS_HID_6813f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
-		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
-	},
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
 	[581] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19347,
+	.class_hid = BNXT_ULP_CLASS_HID_6b5b3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[582] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b607,
+	.class_hid = BNXT_ULP_CLASS_HID_6c1cb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[583] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d8c7,
+	.class_hid = BNXT_ULP_CLASS_HID_6bb8f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[584] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fb87,
+	.class_hid = BNXT_ULP_CLASS_HID_6c807,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[585] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a12b,
+	.class_hid = BNXT_ULP_CLASS_HID_691df,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[586] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a3eb,
+	.class_hid = BNXT_ULP_CLASS_HID_69e57,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 90,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[587] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e6ab,
+	.class_hid = BNXT_ULP_CLASS_HID_6981b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 91,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[588] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e96b,
+	.class_hid = BNXT_ULP_CLASS_HID_6a493,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 92,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[589] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9c1f,
+	.class_hid = BNXT_ULP_CLASS_HID_6d927,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 93,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[590] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bedf,
+	.class_hid = BNXT_ULP_CLASS_HID_688f3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 93,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[591] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e19f,
+	.class_hid = BNXT_ULP_CLASS_HID_682b7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 93,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[592] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e45f,
+	.class_hid = BNXT_ULP_CLASS_HID_68ecf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 93,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[593] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b21f,
+	.class_hid = BNXT_ULP_CLASS_HID_6b7c7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 93,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[594] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b4df,
+	.class_hid = BNXT_ULP_CLASS_HID_6c45f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 93,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[595] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f79f,
+	.class_hid = BNXT_ULP_CLASS_HID_6be03,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 94,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[596] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fa5f,
+	.class_hid = BNXT_ULP_CLASS_HID_6ca9b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 95,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[597] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b72b,
+	.class_hid = BNXT_ULP_CLASS_HID_6a263,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[598] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b9eb,
+	.class_hid = BNXT_ULP_CLASS_HID_6aefb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[599] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fcab,
+	.class_hid = BNXT_ULP_CLASS_HID_6a8bf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[600] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ff6b,
+	.class_hid = BNXT_ULP_CLASS_HID_6b537,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[601] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c4bf,
+	.class_hid = BNXT_ULP_CLASS_HID_6dbbb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[602] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e77f,
+	.class_hid = BNXT_ULP_CLASS_HID_68b07,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[603] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ca3f,
+	.class_hid = BNXT_ULP_CLASS_HID_684cb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[604] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ecff,
+	.class_hid = BNXT_ULP_CLASS_HID_69143,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[605] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bfe3,
+	.class_hid = BNXT_ULP_CLASS_HID_6c5d7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[606] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e2a3,
+	.class_hid = BNXT_ULP_CLASS_HID_6d26f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[607] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c563,
+	.class_hid = BNXT_ULP_CLASS_HID_6cc13,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[608] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e823,
+	.class_hid = BNXT_ULP_CLASS_HID_6d8ab,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[609] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d5e3,
+	.class_hid = BNXT_ULP_CLASS_HID_38917,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[610] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f8a3,
+	.class_hid = BNXT_ULP_CLASS_HID_395af,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[611] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1db63,
+	.class_hid = BNXT_ULP_CLASS_HID_38f53,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[612] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e117,
+	.class_hid = BNXT_ULP_CLASS_HID_39beb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[613] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dabf,
+	.class_hid = BNXT_ULP_CLASS_HID_3d07f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[614] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a0a3,
+	.class_hid = BNXT_ULP_CLASS_HID_3dcf7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[615] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c363,
+	.class_hid = BNXT_ULP_CLASS_HID_3d6bb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[616] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e623,
+	.class_hid = BNXT_ULP_CLASS_HID_38607,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[617] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b043,
+	.class_hid = BNXT_ULP_CLASS_HID_3ac8b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[618] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b303,
+	.class_hid = BNXT_ULP_CLASS_HID_3b903,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[619] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f5c3,
+	.class_hid = BNXT_ULP_CLASS_HID_3b2c7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[620] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f883,
+	.class_hid = BNXT_ULP_CLASS_HID_3bf5f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
-		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
-	},
-	[621] = {
-	.class_hid = BNXT_ULP_CLASS_HID_abb7,
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[621] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39727,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[622] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ae77,
+	.class_hid = BNXT_ULP_CLASS_HID_3a3bf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[623] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f137,
+	.class_hid = BNXT_ULP_CLASS_HID_39d63,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[624] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f3f7,
+	.class_hid = BNXT_ULP_CLASS_HID_3a9fb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[625] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c1b7,
+	.class_hid = BNXT_ULP_CLASS_HID_3d2f3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[626] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e477,
+	.class_hid = BNXT_ULP_CLASS_HID_3825f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[627] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c737,
+	.class_hid = BNXT_ULP_CLASS_HID_3d8cf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[628] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e9f7,
+	.class_hid = BNXT_ULP_CLASS_HID_3889b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[629] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c643,
+	.class_hid = BNXT_ULP_CLASS_HID_3bd2f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[630] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e903,
+	.class_hid = BNXT_ULP_CLASS_HID_3c9a7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[631] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cbc3,
+	.class_hid = BNXT_ULP_CLASS_HID_3c36b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[632] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ee83,
+	.class_hid = BNXT_ULP_CLASS_HID_3cfe3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[633] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d3d7,
+	.class_hid = BNXT_ULP_CLASS_HID_399bb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[634] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f697,
+	.class_hid = BNXT_ULP_CLASS_HID_3a633,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[635] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d957,
+	.class_hid = BNXT_ULP_CLASS_HID_39ff7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[636] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fc17,
+	.class_hid = BNXT_ULP_CLASS_HID_3ac0f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[637] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cf1b,
+	.class_hid = BNXT_ULP_CLASS_HID_383d7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[638] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f1db,
+	.class_hid = BNXT_ULP_CLASS_HID_3906f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[639] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d49b,
+	.class_hid = BNXT_ULP_CLASS_HID_38a13,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[640] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f75b,
+	.class_hid = BNXT_ULP_CLASS_HID_396ab,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[641] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1884f,
+	.class_hid = BNXT_ULP_CLASS_HID_7846b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[642] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ab0f,
+	.class_hid = BNXT_ULP_CLASS_HID_790e3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[643] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cdcf,
+	.class_hid = BNXT_ULP_CLASS_HID_78aa7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[644] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f08f,
+	.class_hid = BNXT_ULP_CLASS_HID_7973f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[645] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18d1b,
+	.class_hid = BNXT_ULP_CLASS_HID_7cbb3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[646] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1afdb,
+	.class_hid = BNXT_ULP_CLASS_HID_7d7cb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[647] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d29b,
+	.class_hid = BNXT_ULP_CLASS_HID_7d18f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[648] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f55b,
+	.class_hid = BNXT_ULP_CLASS_HID_7815b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[649] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9aef,
+	.class_hid = BNXT_ULP_CLASS_HID_7a7df,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[650] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bdaf,
+	.class_hid = BNXT_ULP_CLASS_HID_7b457,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[651] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e06f,
+	.class_hid = BNXT_ULP_CLASS_HID_7ae1b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[652] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e32f,
+	.class_hid = BNXT_ULP_CLASS_HID_7ba93,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[653] = {
-	.class_hid = BNXT_ULP_CLASS_HID_95d3,
+	.class_hid = BNXT_ULP_CLASS_HID_7927b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[654] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b893,
+	.class_hid = BNXT_ULP_CLASS_HID_79ef3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[655] = {
-	.class_hid = BNXT_ULP_CLASS_HID_db53,
+	.class_hid = BNXT_ULP_CLASS_HID_798b7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[656] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fe13,
+	.class_hid = BNXT_ULP_CLASS_HID_7a4cf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[657] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1abd3,
+	.class_hid = BNXT_ULP_CLASS_HID_7cdc7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[658] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ae93,
+	.class_hid = BNXT_ULP_CLASS_HID_7da5f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[659] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f153,
+	.class_hid = BNXT_ULP_CLASS_HID_7d403,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[660] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f413,
+	.class_hid = BNXT_ULP_CLASS_HID_783ef,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[661] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b0ef,
+	.class_hid = BNXT_ULP_CLASS_HID_7b863,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[662] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b3af,
+	.class_hid = BNXT_ULP_CLASS_HID_7c4fb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[663] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f66f,
+	.class_hid = BNXT_ULP_CLASS_HID_7bebf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[664] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f92f,
+	.class_hid = BNXT_ULP_CLASS_HID_7cb37,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[665] = {
-	.class_hid = BNXT_ULP_CLASS_HID_be73,
+	.class_hid = BNXT_ULP_CLASS_HID_7948f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[666] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e133,
+	.class_hid = BNXT_ULP_CLASS_HID_7a107,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[667] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c3f3,
+	.class_hid = BNXT_ULP_CLASS_HID_79acb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[668] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e6b3,
+	.class_hid = BNXT_ULP_CLASS_HID_7a743,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[669] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b9a7,
+	.class_hid = BNXT_ULP_CLASS_HID_7dbd7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[670] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bc67,
+	.class_hid = BNXT_ULP_CLASS_HID_78ba3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[671] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ff27,
+	.class_hid = BNXT_ULP_CLASS_HID_78567,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[672] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e1e7,
+	.class_hid = BNXT_ULP_CLASS_HID_791ff,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[673] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cfa7,
+	.class_hid = BNXT_ULP_CLASS_HID_a3db,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16661,20 +17813,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[674] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f267,
+	.class_hid = BNXT_ULP_CLASS_HID_b043,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131080,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16683,21 +17830,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[675] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d527,
+	.class_hid = BNXT_ULP_CLASS_HID_aa07,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16706,21 +17848,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[676] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f7e7,
+	.class_hid = BNXT_ULP_CLASS_HID_b68f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131080,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16729,22 +17866,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[677] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d473,
+	.class_hid = BNXT_ULP_CLASS_HID_8e67,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16753,19 +17885,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[678] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f733,
+	.class_hid = BNXT_ULP_CLASS_HID_9aef,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16774,20 +17903,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[679] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d9f3,
+	.class_hid = BNXT_ULP_CLASS_HID_94a3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16796,20 +17922,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[680] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fcb3,
+	.class_hid = BNXT_ULP_CLASS_HID_a12b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16818,21 +17941,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[681] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aa07,
+	.class_hid = BNXT_ULP_CLASS_HID_c7af,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16841,16 +17961,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[682] = {
-	.class_hid = BNXT_ULP_CLASS_HID_acc7,
+	.class_hid = BNXT_ULP_CLASS_HID_d3d7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131080,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16859,17 +17979,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[683] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ef87,
+	.class_hid = BNXT_ULP_CLASS_HID_cdeb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16878,17 +17998,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[684] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f247,
+	.class_hid = BNXT_ULP_CLASS_HID_da13,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131080,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16897,18 +18017,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[685] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a54b,
+	.class_hid = BNXT_ULP_CLASS_HID_b1cb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16917,17 +18037,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[686] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a80b,
+	.class_hid = BNXT_ULP_CLASS_HID_be73,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16936,18 +18056,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[687] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eacb,
+	.class_hid = BNXT_ULP_CLASS_HID_b837,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16956,18 +18076,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[688] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ed8b,
+	.class_hid = BNXT_ULP_CLASS_HID_c4bf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16976,19 +18096,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[689] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bb4b,
+	.class_hid = BNXT_ULP_CLASS_HID_49f0f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -16997,18 +18117,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[690] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1be0b,
+	.class_hid = BNXT_ULP_CLASS_HID_4abb7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131080,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17017,19 +18135,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[691] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c0cb,
+	.class_hid = BNXT_ULP_CLASS_HID_4a54b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17038,19 +18154,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[692] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e38b,
+	.class_hid = BNXT_ULP_CLASS_HID_4b1f3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131080,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17059,20 +18173,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[693] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c007,
+	.class_hid = BNXT_ULP_CLASS_HID_489ab,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17081,17 +18193,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[694] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e2c7,
+	.class_hid = BNXT_ULP_CLASS_HID_495d3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17100,18 +18212,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[695] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c587,
+	.class_hid = BNXT_ULP_CLASS_HID_48f97,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17120,18 +18232,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[696] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e847,
+	.class_hid = BNXT_ULP_CLASS_HID_49c1f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17140,19 +18252,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[697] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cdeb,
+	.class_hid = BNXT_ULP_CLASS_HID_4c293,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17161,17 +18273,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[698] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f0ab,
+	.class_hid = BNXT_ULP_CLASS_HID_4cf1b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131080,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17180,18 +18292,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[699] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d36b,
+	.class_hid = BNXT_ULP_CLASS_HID_4c8df,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17200,18 +18312,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[700] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f62b,
+	.class_hid = BNXT_ULP_CLASS_HID_4d547,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131080,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17220,19 +18332,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[701] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c8df,
+	.class_hid = BNXT_ULP_CLASS_HID_4ad3f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17241,18 +18353,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[702] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eb9f,
+	.class_hid = BNXT_ULP_CLASS_HID_4b9a7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17261,19 +18373,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[703] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ce5f,
+	.class_hid = BNXT_ULP_CLASS_HID_4b37b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17282,19 +18394,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[704] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f11f,
+	.class_hid = BNXT_ULP_CLASS_HID_4bfe3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131144,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17303,20 +18415,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[705] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18203,
+	.class_hid = BNXT_ULP_CLASS_HID_1b9db,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17325,19 +18437,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[706] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a4c3,
+	.class_hid = BNXT_ULP_CLASS_HID_1c643,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17346,20 +18455,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[707] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c783,
+	.class_hid = BNXT_ULP_CLASS_HID_1c007,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17368,20 +18474,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[708] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ea43,
+	.class_hid = BNXT_ULP_CLASS_HID_1cc8f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17390,21 +18493,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[709] = {
-	.class_hid = BNXT_ULP_CLASS_HID_186df,
+	.class_hid = BNXT_ULP_CLASS_HID_1a467,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17413,18 +18513,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[710] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a99f,
+	.class_hid = BNXT_ULP_CLASS_HID_1b0ef,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17433,19 +18532,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[711] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cc5f,
+	.class_hid = BNXT_ULP_CLASS_HID_1aaa3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17454,19 +18552,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[712] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ef1f,
+	.class_hid = BNXT_ULP_CLASS_HID_1b72b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17475,20 +18572,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[713] = {
-	.class_hid = BNXT_ULP_CLASS_HID_94a3,
+	.class_hid = BNXT_ULP_CLASS_HID_18093,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17497,17 +18593,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[714] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b763,
+	.class_hid = BNXT_ULP_CLASS_HID_18d1b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 96,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17516,18 +18612,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[715] = {
-	.class_hid = BNXT_ULP_CLASS_HID_da23,
+	.class_hid = BNXT_ULP_CLASS_HID_186df,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 97,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17536,18 +18632,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[716] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fce3,
+	.class_hid = BNXT_ULP_CLASS_HID_19347,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 98,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17556,19 +18652,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[717] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8f97,
+	.class_hid = BNXT_ULP_CLASS_HID_1c7cb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 99,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17577,18 +18673,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[718] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b257,
+	.class_hid = BNXT_ULP_CLASS_HID_1d473,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 99,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17597,19 +18693,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[719] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d517,
+	.class_hid = BNXT_ULP_CLASS_HID_1ce37,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 99,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17618,19 +18714,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[720] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f7d7,
+	.class_hid = BNXT_ULP_CLASS_HID_1dabf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 99,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17639,20 +18735,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[721] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a597,
+	.class_hid = BNXT_ULP_CLASS_HID_5b50f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 99,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17661,19 +18757,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[722] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a857,
+	.class_hid = BNXT_ULP_CLASS_HID_5c1b7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 99,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17682,20 +18776,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[723] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eb17,
+	.class_hid = BNXT_ULP_CLASS_HID_5bb4b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 100,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17704,20 +18796,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[724] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1edd7,
+	.class_hid = BNXT_ULP_CLASS_HID_5c7f3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 101,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17726,21 +18816,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[725] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1aaa3,
+	.class_hid = BNXT_ULP_CLASS_HID_59fab,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17749,18 +18837,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[726] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ad63,
+	.class_hid = BNXT_ULP_CLASS_HID_5abd3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17769,19 +18857,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[727] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f023,
+	.class_hid = BNXT_ULP_CLASS_HID_5a597,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17790,19 +18878,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[728] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f2e3,
+	.class_hid = BNXT_ULP_CLASS_HID_5b21f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17811,20 +18899,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[729] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b837,
+	.class_hid = BNXT_ULP_CLASS_HID_5d893,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17833,18 +18921,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[730] = {
-	.class_hid = BNXT_ULP_CLASS_HID_baf7,
+	.class_hid = BNXT_ULP_CLASS_HID_5884f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17853,19 +18941,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[731] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fdb7,
+	.class_hid = BNXT_ULP_CLASS_HID_58203,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17874,19 +18962,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[732] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e077,
+	.class_hid = BNXT_ULP_CLASS_HID_58e8b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17895,20 +18983,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[733] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b37b,
+	.class_hid = BNXT_ULP_CLASS_HID_5c33f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17917,19 +19005,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[734] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b63b,
+	.class_hid = BNXT_ULP_CLASS_HID_5cfa7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17938,20 +19026,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[735] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f8fb,
+	.class_hid = BNXT_ULP_CLASS_HID_5c97b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17960,20 +19048,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[736] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fbbb,
+	.class_hid = BNXT_ULP_CLASS_HID_5d5e3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -17982,21 +19070,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[737] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c97b,
+	.class_hid = BNXT_ULP_CLASS_HID_e95b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18005,20 +19093,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[738] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ec3b,
+	.class_hid = BNXT_ULP_CLASS_HID_f5c3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18027,21 +19111,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[739] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cefb,
+	.class_hid = BNXT_ULP_CLASS_HID_ef87,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18050,21 +19130,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[740] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f1bb,
+	.class_hid = BNXT_ULP_CLASS_HID_fc0f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18073,22 +19149,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[741] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ce37,
+	.class_hid = BNXT_ULP_CLASS_HID_d3e7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18097,19 +19169,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[742] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f0f7,
+	.class_hid = BNXT_ULP_CLASS_HID_e06f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18118,20 +19188,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[743] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d3b7,
+	.class_hid = BNXT_ULP_CLASS_HID_da23,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18140,20 +19208,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[744] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f677,
+	.class_hid = BNXT_ULP_CLASS_HID_e6ab,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18162,21 +19228,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[745] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a3db,
+	.class_hid = BNXT_ULP_CLASS_HID_cd2f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18185,15 +19249,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[746] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a69b,
+	.class_hid = BNXT_ULP_CLASS_HID_d957,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18202,16 +19268,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[747] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e95b,
+	.class_hid = BNXT_ULP_CLASS_HID_d36b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18220,16 +19288,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[748] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ec1b,
+	.class_hid = BNXT_ULP_CLASS_HID_c2c7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18238,17 +19308,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[749] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9f0f,
+	.class_hid = BNXT_ULP_CLASS_HID_f74b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18257,16 +19329,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[750] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a1cf,
+	.class_hid = BNXT_ULP_CLASS_HID_c3f3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18275,17 +19349,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[751] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e48f,
+	.class_hid = BNXT_ULP_CLASS_HID_fdb7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18294,17 +19370,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[752] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e74f,
+	.class_hid = BNXT_ULP_CLASS_HID_ca3f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18313,18 +19391,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[753] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b50f,
+	.class_hid = BNXT_ULP_CLASS_HID_4e48f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18333,17 +19413,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[754] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b7cf,
+	.class_hid = BNXT_ULP_CLASS_HID_4f137,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18352,18 +19432,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[755] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fa8f,
+	.class_hid = BNXT_ULP_CLASS_HID_4eacb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18372,18 +19452,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[756] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fd4f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f773,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18392,19 +19472,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[757] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b9db,
+	.class_hid = BNXT_ULP_CLASS_HID_4cf2b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18413,16 +19493,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[758] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bc9b,
+	.class_hid = BNXT_ULP_CLASS_HID_4db53,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18431,17 +19513,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[759] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ff5b,
+	.class_hid = BNXT_ULP_CLASS_HID_4d517,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18450,17 +19534,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[760] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e21b,
+	.class_hid = BNXT_ULP_CLASS_HID_4e19f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18469,18 +19555,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[761] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c7af,
+	.class_hid = BNXT_ULP_CLASS_HID_4c813,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18489,16 +19577,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[762] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ea6f,
+	.class_hid = BNXT_ULP_CLASS_HID_4d49b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18507,17 +19597,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[763] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cd2f,
+	.class_hid = BNXT_ULP_CLASS_HID_4ce5f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18526,17 +19618,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[764] = {
-	.class_hid = BNXT_ULP_CLASS_HID_efef,
+	.class_hid = BNXT_ULP_CLASS_HID_4dac7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18545,18 +19639,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[765] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c293,
+	.class_hid = BNXT_ULP_CLASS_HID_4f2bf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18565,17 +19661,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[766] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e553,
+	.class_hid = BNXT_ULP_CLASS_HID_4ff27,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18584,18 +19682,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[767] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c813,
+	.class_hid = BNXT_ULP_CLASS_HID_4f8fb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18604,18 +19704,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[768] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ead3,
+	.class_hid = BNXT_ULP_CLASS_HID_4c563,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18624,19 +19726,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[769] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d893,
+	.class_hid = BNXT_ULP_CLASS_HID_1ff5b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18645,18 +19749,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[770] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fb53,
+	.class_hid = BNXT_ULP_CLASS_HID_1cbc3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18665,19 +19768,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[771] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c147,
+	.class_hid = BNXT_ULP_CLASS_HID_1c587,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18686,19 +19788,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[772] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e407,
+	.class_hid = BNXT_ULP_CLASS_HID_1d20f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18707,20 +19808,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[773] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18093,
+	.class_hid = BNXT_ULP_CLASS_HID_1e9e7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18729,17 +19829,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[774] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a353,
+	.class_hid = BNXT_ULP_CLASS_HID_1f66f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18748,18 +19849,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[775] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c613,
+	.class_hid = BNXT_ULP_CLASS_HID_1f023,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18768,18 +19870,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[776] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e8d3,
+	.class_hid = BNXT_ULP_CLASS_HID_1fcab,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18788,19 +19891,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[777] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8e67,
+	.class_hid = BNXT_ULP_CLASS_HID_1c613,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18809,16 +19913,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[778] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b127,
+	.class_hid = BNXT_ULP_CLASS_HID_1d29b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18827,17 +19933,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[779] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d3e7,
+	.class_hid = BNXT_ULP_CLASS_HID_1cc5f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18846,17 +19954,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[780] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f6a7,
+	.class_hid = BNXT_ULP_CLASS_HID_1d8c7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18865,18 +19975,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[781] = {
-	.class_hid = BNXT_ULP_CLASS_HID_89ab,
+	.class_hid = BNXT_ULP_CLASS_HID_1cd4b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18885,17 +19997,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[782] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ac6b,
+	.class_hid = BNXT_ULP_CLASS_HID_1d9f3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18904,18 +20018,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[783] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cf2b,
+	.class_hid = BNXT_ULP_CLASS_HID_1d3b7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18924,18 +20040,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[784] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f1eb,
+	.class_hid = BNXT_ULP_CLASS_HID_1c363,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18944,19 +20062,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[785] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19fab,
+	.class_hid = BNXT_ULP_CLASS_HID_5fa8f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18965,18 +20085,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[786] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a26b,
+	.class_hid = BNXT_ULP_CLASS_HID_5c737,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -18985,19 +20105,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[787] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e52b,
+	.class_hid = BNXT_ULP_CLASS_HID_5c0cb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19006,19 +20126,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[788] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e7eb,
+	.class_hid = BNXT_ULP_CLASS_HID_5cd73,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19027,20 +20147,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[789] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a467,
+	.class_hid = BNXT_ULP_CLASS_HID_5e52b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19049,17 +20169,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[790] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a727,
+	.class_hid = BNXT_ULP_CLASS_HID_5f153,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19068,18 +20190,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[791] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e9e7,
+	.class_hid = BNXT_ULP_CLASS_HID_5eb17,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19088,18 +20212,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[792] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eca7,
+	.class_hid = BNXT_ULP_CLASS_HID_5f79f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19108,19 +20234,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[793] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b1cb,
+	.class_hid = BNXT_ULP_CLASS_HID_5c147,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19129,17 +20257,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[794] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b48b,
+	.class_hid = BNXT_ULP_CLASS_HID_5cdcf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19148,18 +20278,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[795] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f74b,
+	.class_hid = BNXT_ULP_CLASS_HID_5c783,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19168,18 +20300,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[796] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fa0b,
+	.class_hid = BNXT_ULP_CLASS_HID_5d40b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19188,19 +20322,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[797] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ad3f,
+	.class_hid = BNXT_ULP_CLASS_HID_5c8bf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19209,18 +20345,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[798] = {
-	.class_hid = BNXT_ULP_CLASS_HID_afff,
+	.class_hid = BNXT_ULP_CLASS_HID_5d527,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19229,19 +20367,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[799] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f2bf,
+	.class_hid = BNXT_ULP_CLASS_HID_5cefb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19250,19 +20390,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[800] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f57f,
+	.class_hid = BNXT_ULP_CLASS_HID_5db63,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19271,20 +20413,22 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[801] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c33f,
+	.class_hid = BNXT_ULP_CLASS_HID_a69b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19293,19 +20437,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[802] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e5ff,
+	.class_hid = BNXT_ULP_CLASS_HID_b303,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19314,20 +20455,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[803] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c8bf,
+	.class_hid = BNXT_ULP_CLASS_HID_acc7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19336,20 +20474,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[804] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eb7f,
+	.class_hid = BNXT_ULP_CLASS_HID_b94f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19358,21 +20493,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[805] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c7cb,
+	.class_hid = BNXT_ULP_CLASS_HID_b127,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19381,18 +20513,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[806] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ea8b,
+	.class_hid = BNXT_ULP_CLASS_HID_bdaf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655432,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19401,19 +20532,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[807] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cd4b,
+	.class_hid = BNXT_ULP_CLASS_HID_b763,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19422,19 +20552,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[808] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f00b,
+	.class_hid = BNXT_ULP_CLASS_HID_a3eb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655432,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -19443,21 +20572,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[809] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9117,
+	.class_hid = BNXT_ULP_CLASS_HID_ea6f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19465,16 +20593,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[810] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b3d7,
+	.class_hid = BNXT_ULP_CLASS_HID_f697,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19482,17 +20612,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[811] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d697,
+	.class_hid = BNXT_ULP_CLASS_HID_f0ab,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19500,17 +20632,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[812] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f957,
+	.class_hid = BNXT_ULP_CLASS_HID_a007,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19518,18 +20652,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[813] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8c5b,
+	.class_hid = BNXT_ULP_CLASS_HID_b48b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19537,17 +20673,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[814] = {
-	.class_hid = BNXT_ULP_CLASS_HID_af1b,
+	.class_hid = BNXT_ULP_CLASS_HID_e133,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655432,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19555,18 +20693,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[815] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d1db,
+	.class_hid = BNXT_ULP_CLASS_HID_baf7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19574,18 +20714,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[816] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f49b,
+	.class_hid = BNXT_ULP_CLASS_HID_e77f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655432,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19593,19 +20735,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[817] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a25b,
+	.class_hid = BNXT_ULP_CLASS_HID_4a1cf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19613,18 +20757,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[818] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a51b,
+	.class_hid = BNXT_ULP_CLASS_HID_4ae77,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19632,19 +20776,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[819] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e7db,
+	.class_hid = BNXT_ULP_CLASS_HID_4a80b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19652,19 +20796,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[820] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ea9b,
+	.class_hid = BNXT_ULP_CLASS_HID_4b4b3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19672,20 +20816,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[821] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a717,
+	.class_hid = BNXT_ULP_CLASS_HID_4ac6b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19693,17 +20837,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[822] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a9d7,
+	.class_hid = BNXT_ULP_CLASS_HID_4b893,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655432,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19711,18 +20857,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[823] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ec97,
+	.class_hid = BNXT_ULP_CLASS_HID_4b257,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19730,18 +20878,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[824] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ef57,
+	.class_hid = BNXT_ULP_CLASS_HID_4bedf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655432,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19749,19 +20899,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[825] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b4fb,
+	.class_hid = BNXT_ULP_CLASS_HID_4e553,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19769,17 +20921,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[826] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b7bb,
+	.class_hid = BNXT_ULP_CLASS_HID_4f1db,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19787,18 +20941,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[827] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fa7b,
+	.class_hid = BNXT_ULP_CLASS_HID_4eb9f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19806,18 +20962,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[828] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fd3b,
+	.class_hid = BNXT_ULP_CLASS_HID_4f807,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19825,19 +20983,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[829] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b02f,
+	.class_hid = BNXT_ULP_CLASS_HID_4afff,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19845,18 +21005,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[830] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b2ef,
+	.class_hid = BNXT_ULP_CLASS_HID_4bc67,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655432,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19864,19 +21026,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[831] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f5af,
+	.class_hid = BNXT_ULP_CLASS_HID_4b63b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19884,19 +21048,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[832] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f86f,
+	.class_hid = BNXT_ULP_CLASS_HID_4e2a3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655432,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19904,20 +21070,22 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[833] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c62f,
+	.class_hid = BNXT_ULP_CLASS_HID_1bc9b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19925,19 +21093,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[834] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e8ef,
+	.class_hid = BNXT_ULP_CLASS_HID_1e903,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19945,20 +21112,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[835] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cbaf,
+	.class_hid = BNXT_ULP_CLASS_HID_1e2c7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19966,20 +21132,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[836] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ee6f,
+	.class_hid = BNXT_ULP_CLASS_HID_1ef4f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -19987,21 +21152,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[837] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cafb,
+	.class_hid = BNXT_ULP_CLASS_HID_1a727,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20009,18 +21173,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[838] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1edbb,
+	.class_hid = BNXT_ULP_CLASS_HID_1b3af,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720968,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20028,19 +21193,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[839] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d07b,
+	.class_hid = BNXT_ULP_CLASS_HID_1ad63,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20048,19 +21214,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[840] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f33b,
+	.class_hid = BNXT_ULP_CLASS_HID_1b9eb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720968,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20068,20 +21235,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[841] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8b2b,
+	.class_hid = BNXT_ULP_CLASS_HID_1a353,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20089,15 +21257,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[842] = {
-	.class_hid = BNXT_ULP_CLASS_HID_adeb,
+	.class_hid = BNXT_ULP_CLASS_HID_1afdb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20105,16 +21277,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[843] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d0ab,
+	.class_hid = BNXT_ULP_CLASS_HID_1a99f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20122,16 +21298,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[844] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f36b,
+	.class_hid = BNXT_ULP_CLASS_HID_1b607,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20139,17 +21319,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[845] = {
-	.class_hid = BNXT_ULP_CLASS_HID_861f,
+	.class_hid = BNXT_ULP_CLASS_HID_1ea8b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20157,16 +21341,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[846] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a8df,
+	.class_hid = BNXT_ULP_CLASS_HID_1f733,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720968,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20174,17 +21362,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[847] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cb9f,
+	.class_hid = BNXT_ULP_CLASS_HID_1f0f7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20192,17 +21384,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[848] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ee5f,
+	.class_hid = BNXT_ULP_CLASS_HID_1a0a3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720968,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20210,18 +21406,22 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[849] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19c1f,
+	.class_hid = BNXT_ULP_CLASS_HID_5b7cf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20229,17 +21429,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[850] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bedf,
+	.class_hid = BNXT_ULP_CLASS_HID_5e477,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20247,18 +21449,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[851] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e19f,
+	.class_hid = BNXT_ULP_CLASS_HID_5be0b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20266,18 +21470,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[852] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e45f,
+	.class_hid = BNXT_ULP_CLASS_HID_5eab3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20285,19 +21491,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[853] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a12b,
+	.class_hid = BNXT_ULP_CLASS_HID_5a26b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20305,16 +21513,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[854] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a3eb,
+	.class_hid = BNXT_ULP_CLASS_HID_5ae93,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720968,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20322,17 +21534,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[855] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e6ab,
+	.class_hid = BNXT_ULP_CLASS_HID_5a857,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20340,17 +21556,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[856] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e96b,
+	.class_hid = BNXT_ULP_CLASS_HID_5b4df,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720968,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20358,18 +21578,22 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[857] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aebf,
+	.class_hid = BNXT_ULP_CLASS_HID_5fb53,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20377,16 +21601,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[858] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b17f,
+	.class_hid = BNXT_ULP_CLASS_HID_5ab0f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20394,17 +21622,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[859] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f43f,
+	.class_hid = BNXT_ULP_CLASS_HID_5a4c3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20412,17 +21644,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[860] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f6ff,
+	.class_hid = BNXT_ULP_CLASS_HID_5b14b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720904,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20430,18 +21666,22 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[861] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a9e3,
+	.class_hid = BNXT_ULP_CLASS_HID_5e5ff,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20449,17 +21689,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[862] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aca3,
+	.class_hid = BNXT_ULP_CLASS_HID_5f267,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720968,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20467,18 +21711,22 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[863] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ef63,
+	.class_hid = BNXT_ULP_CLASS_HID_5ec3b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20486,18 +21734,22 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[864] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f223,
+	.class_hid = BNXT_ULP_CLASS_HID_5f8a3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720968,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20505,19 +21757,23 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[865] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bfe3,
+	.class_hid = BNXT_ULP_CLASS_HID_ec1b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20525,18 +21781,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[866] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e2a3,
+	.class_hid = BNXT_ULP_CLASS_HID_f883,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917512,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20544,19 +21800,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[867] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c563,
+	.class_hid = BNXT_ULP_CLASS_HID_f247,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20564,19 +21820,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[868] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e823,
+	.class_hid = BNXT_ULP_CLASS_HID_fecf,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917512,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20584,38 +21840,40 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[869] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c4bf,
+	.class_hid = BNXT_ULP_CLASS_HID_f6a7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
-	.hdr_sig = { .bits =
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[870] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e77f,
+	.class_hid = BNXT_ULP_CLASS_HID_e32f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917576,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20623,18 +21881,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[871] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ca3f,
+	.class_hid = BNXT_ULP_CLASS_HID_fce3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20642,18 +21902,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[872] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ecff,
+	.class_hid = BNXT_ULP_CLASS_HID_e96b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917576,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20661,19 +21923,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[873] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2543,
+	.class_hid = BNXT_ULP_CLASS_HID_efef,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20681,16 +21945,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[874] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b8f,
+	.class_hid = BNXT_ULP_CLASS_HID_fc17,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917512,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20698,17 +21965,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[875] = {
-	.class_hid = BNXT_ULP_CLASS_HID_26f3,
+	.class_hid = BNXT_ULP_CLASS_HID_f62b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20716,18 +21986,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[876] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4f13,
+	.class_hid = BNXT_ULP_CLASS_HID_e587,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917512,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20735,18 +22007,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[877] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a47,
+	.class_hid = BNXT_ULP_CLASS_HID_fa0b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20754,19 +22029,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[878] = {
-	.class_hid = BNXT_ULP_CLASS_HID_162b,
+	.class_hid = BNXT_ULP_CLASS_HID_e6b3,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917576,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20774,18 +22050,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[879] = {
-	.class_hid = BNXT_ULP_CLASS_HID_111f,
+	.class_hid = BNXT_ULP_CLASS_HID_e077,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20793,19 +22072,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[880] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39bf,
+	.class_hid = BNXT_ULP_CLASS_HID_ecff,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917576,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20813,19 +22094,22 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[881] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34e3,
+	.class_hid = BNXT_ULP_CLASS_HID_4e74f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20833,20 +22117,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[882] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20b7,
+	.class_hid = BNXT_ULP_CLASS_HID_4f3f7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917512,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20854,17 +22137,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[883] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48d7,
+	.class_hid = BNXT_ULP_CLASS_HID_4ed8b,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20872,17 +22158,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[884] = {
-	.class_hid = BNXT_ULP_CLASS_HID_441b,
+	.class_hid = BNXT_ULP_CLASS_HID_4fa33,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917512,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20890,18 +22179,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[885] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0fef,
+	.class_hid = BNXT_ULP_CLASS_HID_4f1eb,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20909,17 +22201,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[886] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0ad3,
+	.class_hid = BNXT_ULP_CLASS_HID_4fe13,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917576,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20927,18 +22222,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[887] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3373,
+	.class_hid = BNXT_ULP_CLASS_HID_4f7d7,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20946,18 +22244,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[888] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ea7,
+	.class_hid = BNXT_ULP_CLASS_HID_4e45f,
 	.class_tid = 1,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 102,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917576,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -20965,6159 +22266,6298 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[889] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b6ef,
+	.class_hid = BNXT_ULP_CLASS_HID_4ead3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[890] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b92f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f75b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[891] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fc6f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f11f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[892] = {
-	.class_hid = BNXT_ULP_CLASS_HID_feaf,
+	.class_hid = BNXT_ULP_CLASS_HID_4e0cb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[893] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b193,
+	.class_hid = BNXT_ULP_CLASS_HID_4f57f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[894] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b4d3,
+	.class_hid = BNXT_ULP_CLASS_HID_4e1e7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[895] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f713,
+	.class_hid = BNXT_ULP_CLASS_HID_4fbbb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[896] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fa53,
+	.class_hid = BNXT_ULP_CLASS_HID_4e823,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[897] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c793,
+	.class_hid = BNXT_ULP_CLASS_HID_1e21b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[898] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ead3,
+	.class_hid = BNXT_ULP_CLASS_HID_1ee83,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[899] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cd13,
+	.class_hid = BNXT_ULP_CLASS_HID_1e847,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[900] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f053,
+	.class_hid = BNXT_ULP_CLASS_HID_1f4cf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[901] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ccef,
+	.class_hid = BNXT_ULP_CLASS_HID_1eca7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[902] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ef2f,
+	.class_hid = BNXT_ULP_CLASS_HID_1f92f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[903] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d26f,
+	.class_hid = BNXT_ULP_CLASS_HID_1f2e3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[904] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f4af,
+	.class_hid = BNXT_ULP_CLASS_HID_1ff6b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[905] = {
-	.class_hid = BNXT_ULP_CLASS_HID_da73,
+	.class_hid = BNXT_ULP_CLASS_HID_1e8d3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[906] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a067,
+	.class_hid = BNXT_ULP_CLASS_HID_1f55b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[907] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c2a7,
+	.class_hid = BNXT_ULP_CLASS_HID_1ef1f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[908] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e5e7,
+	.class_hid = BNXT_ULP_CLASS_HID_1fb87,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[909] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d527,
+	.class_hid = BNXT_ULP_CLASS_HID_1f00b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[910] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f867,
+	.class_hid = BNXT_ULP_CLASS_HID_1fcb3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[911] = {
-	.class_hid = BNXT_ULP_CLASS_HID_daa7,
+	.class_hid = BNXT_ULP_CLASS_HID_1f677,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[912] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e0ab,
+	.class_hid = BNXT_ULP_CLASS_HID_1e623,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[913] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18eeb,
+	.class_hid = BNXT_ULP_CLASS_HID_5fd4f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[914] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b12b,
+	.class_hid = BNXT_ULP_CLASS_HID_5e9f7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[915] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d46b,
+	.class_hid = BNXT_ULP_CLASS_HID_5e38b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[916] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f6ab,
+	.class_hid = BNXT_ULP_CLASS_HID_5f033,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[917] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19327,
+	.class_hid = BNXT_ULP_CLASS_HID_5e7eb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[918] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b667,
+	.class_hid = BNXT_ULP_CLASS_HID_5f413,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[919] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d8a7,
+	.class_hid = BNXT_ULP_CLASS_HID_5edd7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[920] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fbe7,
+	.class_hid = BNXT_ULP_CLASS_HID_5fa5f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[921] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a14b,
+	.class_hid = BNXT_ULP_CLASS_HID_5e407,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[922] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a38b,
+	.class_hid = BNXT_ULP_CLASS_HID_5f08f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 102,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[923] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e6cb,
+	.class_hid = BNXT_ULP_CLASS_HID_5ea43,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 103,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[924] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e90b,
+	.class_hid = BNXT_ULP_CLASS_HID_5f6cb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 104,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[925] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9c7f,
+	.class_hid = BNXT_ULP_CLASS_HID_5eb7f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 105,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[926] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bebf,
+	.class_hid = BNXT_ULP_CLASS_HID_5f7e7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 105,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[927] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e1ff,
+	.class_hid = BNXT_ULP_CLASS_HID_5f1bb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 105,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[928] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e43f,
+	.class_hid = BNXT_ULP_CLASS_HID_5e117,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 105,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[929] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b27f,
+	.class_hid = BNXT_ULP_CLASS_HID_244a3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 105,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[930] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b4bf,
+	.class_hid = BNXT_ULP_CLASS_HID_2513b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 105,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[931] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f7ff,
+	.class_hid = BNXT_ULP_CLASS_HID_24b7f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 106,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[932] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fa3f,
+	.class_hid = BNXT_ULP_CLASS_HID_257f7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 107,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[933] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b74b,
+	.class_hid = BNXT_ULP_CLASS_HID_22f1f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[934] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b98b,
+	.class_hid = BNXT_ULP_CLASS_HID_23b97,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[935] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fccb,
+	.class_hid = BNXT_ULP_CLASS_HID_235db,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[936] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ff0b,
+	.class_hid = BNXT_ULP_CLASS_HID_24253,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[937] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c4df,
+	.class_hid = BNXT_ULP_CLASS_HID_20beb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[938] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e71f,
+	.class_hid = BNXT_ULP_CLASS_HID_21863,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[939] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ca5f,
+	.class_hid = BNXT_ULP_CLASS_HID_211a7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[940] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ec9f,
+	.class_hid = BNXT_ULP_CLASS_HID_21e3f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[941] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bf83,
+	.class_hid = BNXT_ULP_CLASS_HID_252b3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[942] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e2c3,
+	.class_hid = BNXT_ULP_CLASS_HID_202df,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[943] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c503,
+	.class_hid = BNXT_ULP_CLASS_HID_2594f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[944] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e843,
+	.class_hid = BNXT_ULP_CLASS_HID_2089b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[945] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d583,
+	.class_hid = BNXT_ULP_CLASS_HID_23193,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[946] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f8c3,
+	.class_hid = BNXT_ULP_CLASS_HID_23e6b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[947] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1db03,
+	.class_hid = BNXT_ULP_CLASS_HID_237af,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[948] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e177,
+	.class_hid = BNXT_ULP_CLASS_HID_24427,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[949] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dadf,
+	.class_hid = BNXT_ULP_CLASS_HID_21c4f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[950] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a0c3,
+	.class_hid = BNXT_ULP_CLASS_HID_228c7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[951] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c303,
+	.class_hid = BNXT_ULP_CLASS_HID_2220b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[952] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e643,
+	.class_hid = BNXT_ULP_CLASS_HID_22e83,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
-	},
-	[953] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b023,
-	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[953] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25507,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[954] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b363,
+	.class_hid = BNXT_ULP_CLASS_HID_20553,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[955] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f5a3,
+	.class_hid = BNXT_ULP_CLASS_HID_25bc3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[956] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f8e3,
+	.class_hid = BNXT_ULP_CLASS_HID_20b6f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32776,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[957] = {
-	.class_hid = BNXT_ULP_CLASS_HID_abd7,
+	.class_hid = BNXT_ULP_CLASS_HID_23fe3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[958] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ae17,
+	.class_hid = BNXT_ULP_CLASS_HID_24c7b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[959] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f157,
+	.class_hid = BNXT_ULP_CLASS_HID_245bf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[960] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f397,
+	.class_hid = BNXT_ULP_CLASS_HID_25237,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[961] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c1d7,
+	.class_hid = BNXT_ULP_CLASS_HID_64077,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[962] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e417,
+	.class_hid = BNXT_ULP_CLASS_HID_64ccf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[963] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c757,
+	.class_hid = BNXT_ULP_CLASS_HID_64633,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[964] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e997,
+	.class_hid = BNXT_ULP_CLASS_HID_6528b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[965] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c623,
+	.class_hid = BNXT_ULP_CLASS_HID_62ad3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[966] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e963,
+	.class_hid = BNXT_ULP_CLASS_HID_636ab,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[967] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cba3,
+	.class_hid = BNXT_ULP_CLASS_HID_630ef,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[968] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eee3,
+	.class_hid = BNXT_ULP_CLASS_HID_63d67,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[969] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d3b7,
+	.class_hid = BNXT_ULP_CLASS_HID_606bf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[970] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f6f7,
+	.class_hid = BNXT_ULP_CLASS_HID_61337,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[971] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d937,
+	.class_hid = BNXT_ULP_CLASS_HID_60d7b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[972] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fc77,
+	.class_hid = BNXT_ULP_CLASS_HID_619f3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[973] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cf7b,
+	.class_hid = BNXT_ULP_CLASS_HID_64e47,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[974] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f1bb,
+	.class_hid = BNXT_ULP_CLASS_HID_65adf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[975] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d4fb,
+	.class_hid = BNXT_ULP_CLASS_HID_65403,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[976] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f73b,
+	.class_hid = BNXT_ULP_CLASS_HID_603af,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[977] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1882f,
+	.class_hid = BNXT_ULP_CLASS_HID_62ca7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[978] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ab6f,
+	.class_hid = BNXT_ULP_CLASS_HID_6393f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[979] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cdaf,
+	.class_hid = BNXT_ULP_CLASS_HID_63363,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[980] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f0ef,
+	.class_hid = BNXT_ULP_CLASS_HID_63ffb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[981] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18d7b,
+	.class_hid = BNXT_ULP_CLASS_HID_61703,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[982] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1afbb,
+	.class_hid = BNXT_ULP_CLASS_HID_6239b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[983] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d2fb,
+	.class_hid = BNXT_ULP_CLASS_HID_61ddf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[984] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f53b,
+	.class_hid = BNXT_ULP_CLASS_HID_62a57,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[985] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9a8f,
+	.class_hid = BNXT_ULP_CLASS_HID_650db,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[986] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bdcf,
+	.class_hid = BNXT_ULP_CLASS_HID_60067,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[987] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e00f,
+	.class_hid = BNXT_ULP_CLASS_HID_65697,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[988] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e34f,
+	.class_hid = BNXT_ULP_CLASS_HID_60623,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49160,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[989] = {
-	.class_hid = BNXT_ULP_CLASS_HID_95b3,
+	.class_hid = BNXT_ULP_CLASS_HID_63ab7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[990] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b8f3,
+	.class_hid = BNXT_ULP_CLASS_HID_6470f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[991] = {
-	.class_hid = BNXT_ULP_CLASS_HID_db33,
+	.class_hid = BNXT_ULP_CLASS_HID_64173,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[992] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fe73,
+	.class_hid = BNXT_ULP_CLASS_HID_64dcb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[993] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1abb3,
+	.class_hid = BNXT_ULP_CLASS_HID_35aa3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[994] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1aef3,
+	.class_hid = BNXT_ULP_CLASS_HID_30acf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[995] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f133,
+	.class_hid = BNXT_ULP_CLASS_HID_30433,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[996] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f473,
+	.class_hid = BNXT_ULP_CLASS_HID_3108b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[997] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b08f,
+	.class_hid = BNXT_ULP_CLASS_HID_3451f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[998] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b3cf,
+	.class_hid = BNXT_ULP_CLASS_HID_35197,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[999] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f60f,
+	.class_hid = BNXT_ULP_CLASS_HID_34bdb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1000] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f94f,
+	.class_hid = BNXT_ULP_CLASS_HID_35853,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1001] = {
-	.class_hid = BNXT_ULP_CLASS_HID_be13,
+	.class_hid = BNXT_ULP_CLASS_HID_321eb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1002] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e153,
+	.class_hid = BNXT_ULP_CLASS_HID_32e63,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1003] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c393,
+	.class_hid = BNXT_ULP_CLASS_HID_327a7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1004] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e6d3,
+	.class_hid = BNXT_ULP_CLASS_HID_3343f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1005] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b9c7,
+	.class_hid = BNXT_ULP_CLASS_HID_30c47,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1006] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bc07,
+	.class_hid = BNXT_ULP_CLASS_HID_318df,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1007] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ff47,
+	.class_hid = BNXT_ULP_CLASS_HID_31203,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1008] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e187,
+	.class_hid = BNXT_ULP_CLASS_HID_31e9b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1009] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cfc7,
+	.class_hid = BNXT_ULP_CLASS_HID_34793,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1010] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f207,
+	.class_hid = BNXT_ULP_CLASS_HID_3546b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1011] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d547,
+	.class_hid = BNXT_ULP_CLASS_HID_34daf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1012] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f787,
+	.class_hid = BNXT_ULP_CLASS_HID_35a27,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1013] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d413,
+	.class_hid = BNXT_ULP_CLASS_HID_3324f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1014] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f753,
+	.class_hid = BNXT_ULP_CLASS_HID_33ec7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1015] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d993,
+	.class_hid = BNXT_ULP_CLASS_HID_3380b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1016] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fcd3,
+	.class_hid = BNXT_ULP_CLASS_HID_34483,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1017] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aa67,
+	.class_hid = BNXT_ULP_CLASS_HID_30edb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1018] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aca7,
+	.class_hid = BNXT_ULP_CLASS_HID_31b53,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1019] = {
-	.class_hid = BNXT_ULP_CLASS_HID_efe7,
+	.class_hid = BNXT_ULP_CLASS_HID_31497,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1020] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f227,
+	.class_hid = BNXT_ULP_CLASS_HID_3216f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98312,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1021] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a52b,
+	.class_hid = BNXT_ULP_CLASS_HID_355e3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1022] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a86b,
+	.class_hid = BNXT_ULP_CLASS_HID_3050f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1023] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eaab,
+	.class_hid = BNXT_ULP_CLASS_HID_35bbf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1024] = {
-	.class_hid = BNXT_ULP_CLASS_HID_edeb,
+	.class_hid = BNXT_ULP_CLASS_HID_30bcb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1025] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bb2b,
+	.class_hid = BNXT_ULP_CLASS_HID_75677,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1026] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1be6b,
+	.class_hid = BNXT_ULP_CLASS_HID_70583,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1027] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c0ab,
+	.class_hid = BNXT_ULP_CLASS_HID_75c33,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1028] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e3eb,
+	.class_hid = BNXT_ULP_CLASS_HID_70c5f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1029] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c067,
+	.class_hid = BNXT_ULP_CLASS_HID_740d3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1030] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e2a7,
+	.class_hid = BNXT_ULP_CLASS_HID_74cab,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1031] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c5e7,
+	.class_hid = BNXT_ULP_CLASS_HID_746ef,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1032] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e827,
+	.class_hid = BNXT_ULP_CLASS_HID_75367,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1033] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cd8b,
+	.class_hid = BNXT_ULP_CLASS_HID_71cbf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1034] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f0cb,
+	.class_hid = BNXT_ULP_CLASS_HID_72937,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1035] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d30b,
+	.class_hid = BNXT_ULP_CLASS_HID_7237b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1036] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f64b,
+	.class_hid = BNXT_ULP_CLASS_HID_72ff3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1037] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c8bf,
+	.class_hid = BNXT_ULP_CLASS_HID_7071b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1038] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ebff,
+	.class_hid = BNXT_ULP_CLASS_HID_71393,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1039] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ce3f,
+	.class_hid = BNXT_ULP_CLASS_HID_70dd7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1040] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f17f,
+	.class_hid = BNXT_ULP_CLASS_HID_719af,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1041] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18263,
+	.class_hid = BNXT_ULP_CLASS_HID_742a7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1042] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a4a3,
+	.class_hid = BNXT_ULP_CLASS_HID_74f3f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1043] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c7e3,
+	.class_hid = BNXT_ULP_CLASS_HID_74963,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1044] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ea23,
+	.class_hid = BNXT_ULP_CLASS_HID_755fb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1045] = {
-	.class_hid = BNXT_ULP_CLASS_HID_186bf,
+	.class_hid = BNXT_ULP_CLASS_HID_72d03,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1046] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a9ff,
+	.class_hid = BNXT_ULP_CLASS_HID_7399b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1047] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cc3f,
+	.class_hid = BNXT_ULP_CLASS_HID_733df,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1048] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ef7f,
+	.class_hid = BNXT_ULP_CLASS_HID_74057,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1049] = {
-	.class_hid = BNXT_ULP_CLASS_HID_94c3,
+	.class_hid = BNXT_ULP_CLASS_HID_709ef,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1050] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b703,
+	.class_hid = BNXT_ULP_CLASS_HID_71667,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 108,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1051] = {
-	.class_hid = BNXT_ULP_CLASS_HID_da43,
+	.class_hid = BNXT_ULP_CLASS_HID_70fab,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 109,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1052] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fc83,
+	.class_hid = BNXT_ULP_CLASS_HID_71c23,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 110,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114696,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1053] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8ff7,
+	.class_hid = BNXT_ULP_CLASS_HID_750b7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 111,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1054] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b237,
+	.class_hid = BNXT_ULP_CLASS_HID_700c3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 111,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1055] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d577,
+	.class_hid = BNXT_ULP_CLASS_HID_75773,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 111,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1056] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f7b7,
+	.class_hid = BNXT_ULP_CLASS_HID_7069f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 111,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1057] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a5f7,
+	.class_hid = BNXT_ULP_CLASS_HID_2cfa3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 111,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1058] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a837,
+	.class_hid = BNXT_ULP_CLASS_HID_2dc3b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 111,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1059] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eb77,
+	.class_hid = BNXT_ULP_CLASS_HID_2d67f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 112,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1060] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1edb7,
+	.class_hid = BNXT_ULP_CLASS_HID_2858b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 113,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1061] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1aac3,
+	.class_hid = BNXT_ULP_CLASS_HID_2ba1f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1062] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ad03,
+	.class_hid = BNXT_ULP_CLASS_HID_2c697,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1063] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f043,
+	.class_hid = BNXT_ULP_CLASS_HID_2c0db,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1064] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f283,
+	.class_hid = BNXT_ULP_CLASS_HID_2cd53,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1065] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b857,
+	.class_hid = BNXT_ULP_CLASS_HID_296eb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1066] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ba97,
+	.class_hid = BNXT_ULP_CLASS_HID_2a363,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1067] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fdd7,
+	.class_hid = BNXT_ULP_CLASS_HID_29ca7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1068] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e017,
+	.class_hid = BNXT_ULP_CLASS_HID_2a93f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1069] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b31b,
+	.class_hid = BNXT_ULP_CLASS_HID_28147,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1070] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b65b,
+	.class_hid = BNXT_ULP_CLASS_HID_28ddf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1071] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f89b,
+	.class_hid = BNXT_ULP_CLASS_HID_28703,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1072] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fbdb,
+	.class_hid = BNXT_ULP_CLASS_HID_2939b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1073] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c91b,
+	.class_hid = BNXT_ULP_CLASS_HID_2bc93,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1074] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ec5b,
+	.class_hid = BNXT_ULP_CLASS_HID_2c96b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1075] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ce9b,
+	.class_hid = BNXT_ULP_CLASS_HID_2c2af,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1076] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f1db,
+	.class_hid = BNXT_ULP_CLASS_HID_2cf27,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1077] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ce57,
+	.class_hid = BNXT_ULP_CLASS_HID_2a74f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1078] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f097,
+	.class_hid = BNXT_ULP_CLASS_HID_2b3c7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1079] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d3d7,
+	.class_hid = BNXT_ULP_CLASS_HID_2ad0b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1080] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f617,
+	.class_hid = BNXT_ULP_CLASS_HID_2b983,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1081] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a3bb,
+	.class_hid = BNXT_ULP_CLASS_HID_283db,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1082] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a6fb,
+	.class_hid = BNXT_ULP_CLASS_HID_29053,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1083] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e93b,
+	.class_hid = BNXT_ULP_CLASS_HID_28997,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1084] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ec7b,
+	.class_hid = BNXT_ULP_CLASS_HID_2966f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163848,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1085] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9f6f,
+	.class_hid = BNXT_ULP_CLASS_HID_2cae3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1086] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a1af,
+	.class_hid = BNXT_ULP_CLASS_HID_2d77b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1087] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e4ef,
+	.class_hid = BNXT_ULP_CLASS_HID_2d0bf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1088] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e72f,
+	.class_hid = BNXT_ULP_CLASS_HID_280cb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163912,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1089] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b56f,
+	.class_hid = BNXT_ULP_CLASS_HID_6cb77,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1090] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b7af,
+	.class_hid = BNXT_ULP_CLASS_HID_6d7cf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1091] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1faef,
+	.class_hid = BNXT_ULP_CLASS_HID_6d133,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1092] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fd2f,
+	.class_hid = BNXT_ULP_CLASS_HID_6815f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1093] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b9bb,
+	.class_hid = BNXT_ULP_CLASS_HID_6b5d3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1094] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bcfb,
+	.class_hid = BNXT_ULP_CLASS_HID_6c1ab,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1095] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ff3b,
+	.class_hid = BNXT_ULP_CLASS_HID_6bbef,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1096] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e27b,
+	.class_hid = BNXT_ULP_CLASS_HID_6c867,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1097] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c7cf,
+	.class_hid = BNXT_ULP_CLASS_HID_691bf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1098] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ea0f,
+	.class_hid = BNXT_ULP_CLASS_HID_69e37,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1099] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cd4f,
+	.class_hid = BNXT_ULP_CLASS_HID_6987b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1100] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ef8f,
+	.class_hid = BNXT_ULP_CLASS_HID_6a4f3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1101] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c2f3,
+	.class_hid = BNXT_ULP_CLASS_HID_6d947,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1102] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e533,
+	.class_hid = BNXT_ULP_CLASS_HID_68893,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1103] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c873,
+	.class_hid = BNXT_ULP_CLASS_HID_682d7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1104] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eab3,
+	.class_hid = BNXT_ULP_CLASS_HID_68eaf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1105] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d8f3,
+	.class_hid = BNXT_ULP_CLASS_HID_6b7a7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1106] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fb33,
+	.class_hid = BNXT_ULP_CLASS_HID_6c43f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1107] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c127,
+	.class_hid = BNXT_ULP_CLASS_HID_6be63,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1108] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e467,
+	.class_hid = BNXT_ULP_CLASS_HID_6cafb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1109] = {
-	.class_hid = BNXT_ULP_CLASS_HID_180f3,
+	.class_hid = BNXT_ULP_CLASS_HID_6a203,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1110] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a333,
+	.class_hid = BNXT_ULP_CLASS_HID_6ae9b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1111] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c673,
+	.class_hid = BNXT_ULP_CLASS_HID_6a8df,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1112] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e8b3,
+	.class_hid = BNXT_ULP_CLASS_HID_6b557,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1113] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8e07,
+	.class_hid = BNXT_ULP_CLASS_HID_6dbdb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1114] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b147,
+	.class_hid = BNXT_ULP_CLASS_HID_68b67,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1115] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d387,
+	.class_hid = BNXT_ULP_CLASS_HID_684ab,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1116] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f6c7,
+	.class_hid = BNXT_ULP_CLASS_HID_69123,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180232,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1117] = {
-	.class_hid = BNXT_ULP_CLASS_HID_89cb,
+	.class_hid = BNXT_ULP_CLASS_HID_6c5b7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1118] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ac0b,
+	.class_hid = BNXT_ULP_CLASS_HID_6d20f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1119] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cf4b,
+	.class_hid = BNXT_ULP_CLASS_HID_6cc73,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1120] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f18b,
+	.class_hid = BNXT_ULP_CLASS_HID_6d8cb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180296,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1121] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19fcb,
+	.class_hid = BNXT_ULP_CLASS_HID_38977,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1122] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a20b,
+	.class_hid = BNXT_ULP_CLASS_HID_395cf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1123] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e54b,
+	.class_hid = BNXT_ULP_CLASS_HID_38f33,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1124] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e78b,
+	.class_hid = BNXT_ULP_CLASS_HID_39b8b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1125] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a407,
+	.class_hid = BNXT_ULP_CLASS_HID_3d01f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1126] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a747,
+	.class_hid = BNXT_ULP_CLASS_HID_3dc97,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1127] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e987,
+	.class_hid = BNXT_ULP_CLASS_HID_3d6db,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1128] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ecc7,
+	.class_hid = BNXT_ULP_CLASS_HID_38667,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1129] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b1ab,
+	.class_hid = BNXT_ULP_CLASS_HID_3aceb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1130] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b4eb,
+	.class_hid = BNXT_ULP_CLASS_HID_3b963,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1131] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f72b,
+	.class_hid = BNXT_ULP_CLASS_HID_3b2a7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1132] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fa6b,
+	.class_hid = BNXT_ULP_CLASS_HID_3bf3f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1133] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ad5f,
+	.class_hid = BNXT_ULP_CLASS_HID_39747,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1134] = {
-	.class_hid = BNXT_ULP_CLASS_HID_af9f,
+	.class_hid = BNXT_ULP_CLASS_HID_3a3df,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1135] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f2df,
+	.class_hid = BNXT_ULP_CLASS_HID_39d03,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1136] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f51f,
+	.class_hid = BNXT_ULP_CLASS_HID_3a99b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1137] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c35f,
+	.class_hid = BNXT_ULP_CLASS_HID_3d293,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1138] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e59f,
+	.class_hid = BNXT_ULP_CLASS_HID_3823f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1139] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c8df,
+	.class_hid = BNXT_ULP_CLASS_HID_3d8af,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1140] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eb1f,
+	.class_hid = BNXT_ULP_CLASS_HID_388fb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1141] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c7ab,
+	.class_hid = BNXT_ULP_CLASS_HID_3bd4f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1142] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eaeb,
+	.class_hid = BNXT_ULP_CLASS_HID_3c9c7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1143] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cd2b,
+	.class_hid = BNXT_ULP_CLASS_HID_3c30b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1144] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f06b,
+	.class_hid = BNXT_ULP_CLASS_HID_3cf83,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229448,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1145] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9177,
+	.class_hid = BNXT_ULP_CLASS_HID_399db,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1146] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b3b7,
+	.class_hid = BNXT_ULP_CLASS_HID_3a653,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1147] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d6f7,
+	.class_hid = BNXT_ULP_CLASS_HID_39f97,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1148] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f937,
+	.class_hid = BNXT_ULP_CLASS_HID_3ac6f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229384,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1149] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8c3b,
+	.class_hid = BNXT_ULP_CLASS_HID_383b7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1150] = {
-	.class_hid = BNXT_ULP_CLASS_HID_af7b,
+	.class_hid = BNXT_ULP_CLASS_HID_3900f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229448,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1151] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d1bb,
+	.class_hid = BNXT_ULP_CLASS_HID_38a73,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1152] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f4fb,
+	.class_hid = BNXT_ULP_CLASS_HID_396cb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229448,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1153] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a23b,
+	.class_hid = BNXT_ULP_CLASS_HID_7840b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1154] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a57b,
+	.class_hid = BNXT_ULP_CLASS_HID_79083,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1155] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e7bb,
+	.class_hid = BNXT_ULP_CLASS_HID_78ac7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1156] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eafb,
+	.class_hid = BNXT_ULP_CLASS_HID_7975f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1157] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a777,
+	.class_hid = BNXT_ULP_CLASS_HID_7cbd3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1158] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a9b7,
+	.class_hid = BNXT_ULP_CLASS_HID_7d7ab,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1159] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ecf7,
+	.class_hid = BNXT_ULP_CLASS_HID_7d1ef,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1160] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ef37,
+	.class_hid = BNXT_ULP_CLASS_HID_7813b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1161] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b49b,
+	.class_hid = BNXT_ULP_CLASS_HID_7a7bf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1162] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b7db,
+	.class_hid = BNXT_ULP_CLASS_HID_7b437,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1163] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fa1b,
+	.class_hid = BNXT_ULP_CLASS_HID_7ae7b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1164] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fd5b,
+	.class_hid = BNXT_ULP_CLASS_HID_7baf3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1165] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b04f,
+	.class_hid = BNXT_ULP_CLASS_HID_7921b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1166] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b28f,
+	.class_hid = BNXT_ULP_CLASS_HID_79e93,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1167] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f5cf,
+	.class_hid = BNXT_ULP_CLASS_HID_798d7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1168] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f80f,
+	.class_hid = BNXT_ULP_CLASS_HID_7a4af,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1169] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c64f,
+	.class_hid = BNXT_ULP_CLASS_HID_7cda7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1170] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e88f,
+	.class_hid = BNXT_ULP_CLASS_HID_7da3f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1171] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cbcf,
+	.class_hid = BNXT_ULP_CLASS_HID_7d463,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1172] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ee0f,
+	.class_hid = BNXT_ULP_CLASS_HID_7838f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1173] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ca9b,
+	.class_hid = BNXT_ULP_CLASS_HID_7b803,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1174] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eddb,
+	.class_hid = BNXT_ULP_CLASS_HID_7c49b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1175] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d01b,
+	.class_hid = BNXT_ULP_CLASS_HID_7bedf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1176] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f35b,
+	.class_hid = BNXT_ULP_CLASS_HID_7cb57,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1177] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8b4b,
+	.class_hid = BNXT_ULP_CLASS_HID_794ef,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1178] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ad8b,
+	.class_hid = BNXT_ULP_CLASS_HID_7a167,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1179] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d0cb,
+	.class_hid = BNXT_ULP_CLASS_HID_79aab,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1180] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f30b,
+	.class_hid = BNXT_ULP_CLASS_HID_7a723,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245768,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1181] = {
-	.class_hid = BNXT_ULP_CLASS_HID_867f,
+	.class_hid = BNXT_ULP_CLASS_HID_7dbb7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1182] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a8bf,
+	.class_hid = BNXT_ULP_CLASS_HID_78bc3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1183] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cbff,
+	.class_hid = BNXT_ULP_CLASS_HID_78507,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1184] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ee3f,
+	.class_hid = BNXT_ULP_CLASS_HID_7919f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245832,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1185] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19c7f,
+	.class_hid = BNXT_ULP_CLASS_HID_a3bb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27125,17 +28565,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1186] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bebf,
+	.class_hid = BNXT_ULP_CLASS_HID_b023,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27143,18 +28582,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1187] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e1ff,
+	.class_hid = BNXT_ULP_CLASS_HID_aa67,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27162,18 +28600,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1188] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e43f,
+	.class_hid = BNXT_ULP_CLASS_HID_b6ef,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27181,19 +28618,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1189] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a14b,
+	.class_hid = BNXT_ULP_CLASS_HID_8e07,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27201,16 +28637,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1190] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a38b,
+	.class_hid = BNXT_ULP_CLASS_HID_9a8f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27218,17 +28655,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1191] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e6cb,
+	.class_hid = BNXT_ULP_CLASS_HID_94c3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27236,17 +28674,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1192] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e90b,
+	.class_hid = BNXT_ULP_CLASS_HID_a14b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27254,18 +28693,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1193] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aedf,
+	.class_hid = BNXT_ULP_CLASS_HID_c7cf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27273,16 +28713,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1194] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b11f,
+	.class_hid = BNXT_ULP_CLASS_HID_d3b7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27290,17 +28731,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1195] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f45f,
+	.class_hid = BNXT_ULP_CLASS_HID_cd8b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27308,17 +28750,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1196] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f69f,
+	.class_hid = BNXT_ULP_CLASS_HID_da73,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27326,18 +28769,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1197] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a983,
+	.class_hid = BNXT_ULP_CLASS_HID_b1ab,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27345,17 +28789,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1198] = {
-	.class_hid = BNXT_ULP_CLASS_HID_acc3,
+	.class_hid = BNXT_ULP_CLASS_HID_be13,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27363,18 +28808,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1199] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ef03,
+	.class_hid = BNXT_ULP_CLASS_HID_b857,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27382,18 +28828,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1200] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f243,
+	.class_hid = BNXT_ULP_CLASS_HID_c4df,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27401,19 +28848,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1201] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bf83,
+	.class_hid = BNXT_ULP_CLASS_HID_49f6f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27421,18 +28869,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1202] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e2c3,
+	.class_hid = BNXT_ULP_CLASS_HID_4abd7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27440,19 +28887,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1203] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c503,
+	.class_hid = BNXT_ULP_CLASS_HID_4a52b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27460,19 +28906,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1204] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e843,
+	.class_hid = BNXT_ULP_CLASS_HID_4b193,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27480,20 +28925,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1205] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c4df,
+	.class_hid = BNXT_ULP_CLASS_HID_489cb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27501,17 +28945,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1206] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e71f,
+	.class_hid = BNXT_ULP_CLASS_HID_495b3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27519,18 +28964,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1207] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ca5f,
+	.class_hid = BNXT_ULP_CLASS_HID_48ff7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27538,18 +28984,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1208] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ec9f,
+	.class_hid = BNXT_ULP_CLASS_HID_49c7f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27557,19 +29004,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1209] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2523,
+	.class_hid = BNXT_ULP_CLASS_HID_4c2f3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27577,16 +29025,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1210] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bef,
+	.class_hid = BNXT_ULP_CLASS_HID_4cf7b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27594,17 +29044,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1211] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2693,
+	.class_hid = BNXT_ULP_CLASS_HID_4c8bf,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27612,18 +29064,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1212] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4f73,
+	.class_hid = BNXT_ULP_CLASS_HID_4d527,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131080,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27631,18 +29084,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1213] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a27,
+	.class_hid = BNXT_ULP_CLASS_HID_4ad5f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27650,19 +29105,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1214] = {
-	.class_hid = BNXT_ULP_CLASS_HID_164b,
+	.class_hid = BNXT_ULP_CLASS_HID_4b9c7,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27670,18 +29125,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1215] = {
-	.class_hid = BNXT_ULP_CLASS_HID_117f,
+	.class_hid = BNXT_ULP_CLASS_HID_4b31b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27689,19 +29146,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1216] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39df,
+	.class_hid = BNXT_ULP_CLASS_HID_4bf83,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131144,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27709,19 +29167,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1217] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3483,
+	.class_hid = BNXT_ULP_CLASS_HID_1b9bb,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27729,20 +29189,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1218] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20d7,
+	.class_hid = BNXT_ULP_CLASS_HID_1c623,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196616,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27750,17 +29207,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1219] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48b7,
+	.class_hid = BNXT_ULP_CLASS_HID_1c067,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27768,17 +29226,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1220] = {
-	.class_hid = BNXT_ULP_CLASS_HID_447b,
+	.class_hid = BNXT_ULP_CLASS_HID_1ccef,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196616,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27786,18 +29245,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1221] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0f8f,
+	.class_hid = BNXT_ULP_CLASS_HID_1a407,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27805,17 +29265,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1222] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0ab3,
+	.class_hid = BNXT_ULP_CLASS_HID_1b08f,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27823,18 +29284,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1223] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3313,
+	.class_hid = BNXT_ULP_CLASS_HID_1aac3,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27842,18 +29304,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1224] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ec7,
+	.class_hid = BNXT_ULP_CLASS_HID_1b74b,
 	.class_tid = 1,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 114,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196680,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -27861,8539 +29324,8224 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1225] = {
-	.class_hid = BNXT_ULP_CLASS_HID_257b7,
+	.class_hid = BNXT_ULP_CLASS_HID_180f3,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1226] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24467,
+	.class_hid = BNXT_ULP_CLASS_HID_18d7b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1227] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23fbb,
+	.class_hid = BNXT_ULP_CLASS_HID_186bf,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1228] = {
-	.class_hid = BNXT_ULP_CLASS_HID_252cb,
+	.class_hid = BNXT_ULP_CLASS_HID_19327,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1229] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21e7f,
+	.class_hid = BNXT_ULP_CLASS_HID_1c7ab,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1230] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20b2f,
+	.class_hid = BNXT_ULP_CLASS_HID_1d413,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1231] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20663,
+	.class_hid = BNXT_ULP_CLASS_HID_1ce57,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1232] = {
-	.class_hid = BNXT_ULP_CLASS_HID_219b3,
+	.class_hid = BNXT_ULP_CLASS_HID_1dadf,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1233] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24213,
+	.class_hid = BNXT_ULP_CLASS_HID_5b56f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 114,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1234] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22ec3,
+	.class_hid = BNXT_ULP_CLASS_HID_5c1d7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 115,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1235] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22a17,
+	.class_hid = BNXT_ULP_CLASS_HID_5bb2b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 115,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1236] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23d27,
+	.class_hid = BNXT_ULP_CLASS_HID_5c793,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1237] = {
-	.class_hid = BNXT_ULP_CLASS_HID_208db,
+	.class_hid = BNXT_ULP_CLASS_HID_59fcb,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1238] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25277,
+	.class_hid = BNXT_ULP_CLASS_HID_5abb3,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1239] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24d8b,
+	.class_hid = BNXT_ULP_CLASS_HID_5a5f7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1240] = {
-	.class_hid = BNXT_ULP_CLASS_HID_203ef,
+	.class_hid = BNXT_ULP_CLASS_HID_5b27f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1241] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2517b,
+	.class_hid = BNXT_ULP_CLASS_HID_5d8f3,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1242] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23e2b,
+	.class_hid = BNXT_ULP_CLASS_HID_5882f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1243] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2397f,
+	.class_hid = BNXT_ULP_CLASS_HID_58263,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1244] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24c8f,
+	.class_hid = BNXT_ULP_CLASS_HID_58eeb,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196616,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1245] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21823,
+	.class_hid = BNXT_ULP_CLASS_HID_5c35f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1246] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20513,
+	.class_hid = BNXT_ULP_CLASS_HID_5cfc7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1247] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20027,
+	.class_hid = BNXT_ULP_CLASS_HID_5c91b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1248] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21377,
+	.class_hid = BNXT_ULP_CLASS_HID_5d583,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196680,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1249] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23bd7,
+	.class_hid = BNXT_ULP_CLASS_HID_e93b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1250] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22887,
+	.class_hid = BNXT_ULP_CLASS_HID_f5a3,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1251] = {
-	.class_hid = BNXT_ULP_CLASS_HID_223db,
+	.class_hid = BNXT_ULP_CLASS_HID_efe7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1252] = {
-	.class_hid = BNXT_ULP_CLASS_HID_236eb,
+	.class_hid = BNXT_ULP_CLASS_HID_fc6f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1253] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2029f,
+	.class_hid = BNXT_ULP_CLASS_HID_d387,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1254] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24c3b,
+	.class_hid = BNXT_ULP_CLASS_HID_e00f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1255] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2474f,
+	.class_hid = BNXT_ULP_CLASS_HID_da43,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1256] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25a9f,
+	.class_hid = BNXT_ULP_CLASS_HID_e6cb,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1257] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24b3f,
+	.class_hid = BNXT_ULP_CLASS_HID_cd4f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1258] = {
-	.class_hid = BNXT_ULP_CLASS_HID_237ef,
+	.class_hid = BNXT_ULP_CLASS_HID_d937,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1259] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23323,
+	.class_hid = BNXT_ULP_CLASS_HID_d30b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1260] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24673,
+	.class_hid = BNXT_ULP_CLASS_HID_c2a7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1261] = {
-	.class_hid = BNXT_ULP_CLASS_HID_211e7,
+	.class_hid = BNXT_ULP_CLASS_HID_f72b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1262] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25b83,
+	.class_hid = BNXT_ULP_CLASS_HID_c393,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1263] = {
-	.class_hid = BNXT_ULP_CLASS_HID_256d7,
+	.class_hid = BNXT_ULP_CLASS_HID_fdd7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1264] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20d3b,
+	.class_hid = BNXT_ULP_CLASS_HID_ca5f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1265] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2359b,
+	.class_hid = BNXT_ULP_CLASS_HID_4e4ef,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 116,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1266] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2224b,
+	.class_hid = BNXT_ULP_CLASS_HID_4f157,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 117,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1267] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21d9f,
+	.class_hid = BNXT_ULP_CLASS_HID_4eaab,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 117,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1268] = {
-	.class_hid = BNXT_ULP_CLASS_HID_230af,
+	.class_hid = BNXT_ULP_CLASS_HID_4f713,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1269] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2590f,
+	.class_hid = BNXT_ULP_CLASS_HID_4cf4b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1270] = {
-	.class_hid = BNXT_ULP_CLASS_HID_245ff,
+	.class_hid = BNXT_ULP_CLASS_HID_4db33,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1271] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24133,
+	.class_hid = BNXT_ULP_CLASS_HID_4d577,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1272] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25443,
+	.class_hid = BNXT_ULP_CLASS_HID_4e1ff,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1273] = {
-	.class_hid = BNXT_ULP_CLASS_HID_244e3,
+	.class_hid = BNXT_ULP_CLASS_HID_4c873,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1274] = {
-	.class_hid = BNXT_ULP_CLASS_HID_231d3,
+	.class_hid = BNXT_ULP_CLASS_HID_4d4fb,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1275] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22ce7,
+	.class_hid = BNXT_ULP_CLASS_HID_4ce3f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1276] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24037,
+	.class_hid = BNXT_ULP_CLASS_HID_4daa7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1277] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20bab,
+	.class_hid = BNXT_ULP_CLASS_HID_4f2df,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1278] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25547,
+	.class_hid = BNXT_ULP_CLASS_HID_4ff47,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1279] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2509b,
+	.class_hid = BNXT_ULP_CLASS_HID_4f89b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1280] = {
-	.class_hid = BNXT_ULP_CLASS_HID_206ff,
+	.class_hid = BNXT_ULP_CLASS_HID_4c503,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1281] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22f5f,
+	.class_hid = BNXT_ULP_CLASS_HID_1ff3b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1282] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21c0f,
+	.class_hid = BNXT_ULP_CLASS_HID_1cba3,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1283] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21743,
+	.class_hid = BNXT_ULP_CLASS_HID_1c5e7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1284] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22a93,
+	.class_hid = BNXT_ULP_CLASS_HID_1d26f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1285] = {
-	.class_hid = BNXT_ULP_CLASS_HID_252f3,
+	.class_hid = BNXT_ULP_CLASS_HID_1e987,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1286] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23fa3,
+	.class_hid = BNXT_ULP_CLASS_HID_1f60f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1287] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23af7,
+	.class_hid = BNXT_ULP_CLASS_HID_1f043,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1288] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24e07,
+	.class_hid = BNXT_ULP_CLASS_HID_1fccb,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1289] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2322f,
+	.class_hid = BNXT_ULP_CLASS_HID_1c673,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1290] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21f1f,
+	.class_hid = BNXT_ULP_CLASS_HID_1d2fb,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1291] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21a53,
+	.class_hid = BNXT_ULP_CLASS_HID_1cc3f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1292] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22d63,
+	.class_hid = BNXT_ULP_CLASS_HID_1d8a7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1293] = {
-	.class_hid = BNXT_ULP_CLASS_HID_255c3,
+	.class_hid = BNXT_ULP_CLASS_HID_1cd2b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1294] = {
-	.class_hid = BNXT_ULP_CLASS_HID_242b3,
+	.class_hid = BNXT_ULP_CLASS_HID_1d993,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1295] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23dc7,
+	.class_hid = BNXT_ULP_CLASS_HID_1d3d7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1296] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25117,
+	.class_hid = BNXT_ULP_CLASS_HID_1c303,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1297] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c13,
+	.class_hid = BNXT_ULP_CLASS_HID_5faef,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1298] = {
-	.class_hid = BNXT_ULP_CLASS_HID_218c3,
+	.class_hid = BNXT_ULP_CLASS_HID_5c757,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1299] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21417,
+	.class_hid = BNXT_ULP_CLASS_HID_5c0ab,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1300] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22727,
+	.class_hid = BNXT_ULP_CLASS_HID_5cd13,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1301] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24f87,
+	.class_hid = BNXT_ULP_CLASS_HID_5e54b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1302] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23c77,
+	.class_hid = BNXT_ULP_CLASS_HID_5f133,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1303] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2378b,
+	.class_hid = BNXT_ULP_CLASS_HID_5eb77,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1304] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24adb,
+	.class_hid = BNXT_ULP_CLASS_HID_5f7ff,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1305] = {
-	.class_hid = BNXT_ULP_CLASS_HID_257b,
+	.class_hid = BNXT_ULP_CLASS_HID_5c127,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1306] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bb7,
+	.class_hid = BNXT_ULP_CLASS_HID_5cdaf,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1307] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1867,
+	.class_hid = BNXT_ULP_CLASS_HID_5c7e3,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1308] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4f2b,
+	.class_hid = BNXT_ULP_CLASS_HID_5d46b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1309] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c1b,
+	.class_hid = BNXT_ULP_CLASS_HID_5c8df,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1310] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1613,
+	.class_hid = BNXT_ULP_CLASS_HID_5d547,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1311] = {
-	.class_hid = BNXT_ULP_CLASS_HID_02c3,
+	.class_hid = BNXT_ULP_CLASS_HID_5ce9b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1312] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3987,
+	.class_hid = BNXT_ULP_CLASS_HID_5db03,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1313] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2677,
+	.class_hid = BNXT_ULP_CLASS_HID_a6fb,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1314] = {
-	.class_hid = BNXT_ULP_CLASS_HID_122b,
+	.class_hid = BNXT_ULP_CLASS_HID_b363,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1315] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48ef,
+	.class_hid = BNXT_ULP_CLASS_HID_aca7,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1316] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35df,
+	.class_hid = BNXT_ULP_CLASS_HID_b92f,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1317] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0fd7,
+	.class_hid = BNXT_ULP_CLASS_HID_b147,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1318] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5973,
+	.class_hid = BNXT_ULP_CLASS_HID_bdcf,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655432,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1319] = {
-	.class_hid = BNXT_ULP_CLASS_HID_334b,
+	.class_hid = BNXT_ULP_CLASS_HID_b703,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1320] = {
-	.class_hid = BNXT_ULP_CLASS_HID_203b,
+	.class_hid = BNXT_ULP_CLASS_HID_a38b,
 	.class_tid = 1,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 118,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655432,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1321] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25797,
+	.class_hid = BNXT_ULP_CLASS_HID_ea0f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1322] = {
-	.class_hid = BNXT_ULP_CLASS_HID_285eb,
+	.class_hid = BNXT_ULP_CLASS_HID_f6f7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1323] = {
-	.class_hid = BNXT_ULP_CLASS_HID_310eb,
+	.class_hid = BNXT_ULP_CLASS_HID_f0cb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1324] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39beb,
+	.class_hid = BNXT_ULP_CLASS_HID_a067,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1325] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24447,
+	.class_hid = BNXT_ULP_CLASS_HID_b4eb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1326] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cf47,
+	.class_hid = BNXT_ULP_CLASS_HID_e153,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655432,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1327] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35a47,
+	.class_hid = BNXT_ULP_CLASS_HID_ba97,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1328] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3889b,
+	.class_hid = BNXT_ULP_CLASS_HID_e71f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655432,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1329] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23f9b,
+	.class_hid = BNXT_ULP_CLASS_HID_4a1af,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1330] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ca9b,
+	.class_hid = BNXT_ULP_CLASS_HID_4ae17,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1331] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3559b,
+	.class_hid = BNXT_ULP_CLASS_HID_4a86b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1332] = {
-	.class_hid = BNXT_ULP_CLASS_HID_383ef,
+	.class_hid = BNXT_ULP_CLASS_HID_4b4d3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1333] = {
-	.class_hid = BNXT_ULP_CLASS_HID_252eb,
+	.class_hid = BNXT_ULP_CLASS_HID_4ac0b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1334] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2813f,
+	.class_hid = BNXT_ULP_CLASS_HID_4b8f3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655432,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1335] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30c3f,
+	.class_hid = BNXT_ULP_CLASS_HID_4b237,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1336] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3973f,
+	.class_hid = BNXT_ULP_CLASS_HID_4bebf,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655432,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1337] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21e5f,
+	.class_hid = BNXT_ULP_CLASS_HID_4e533,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1338] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a95f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f1bb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1339] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3345f,
+	.class_hid = BNXT_ULP_CLASS_HID_4ebff,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1340] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bf5f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f867,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1341] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20b0f,
+	.class_hid = BNXT_ULP_CLASS_HID_4af9f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1342] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2960f,
+	.class_hid = BNXT_ULP_CLASS_HID_4bc07,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655432,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1343] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3210f,
+	.class_hid = BNXT_ULP_CLASS_HID_4b65b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1344] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ac0f,
+	.class_hid = BNXT_ULP_CLASS_HID_4e2c3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655432,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1345] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20643,
+	.class_hid = BNXT_ULP_CLASS_HID_1bcfb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1346] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29143,
+	.class_hid = BNXT_ULP_CLASS_HID_1e963,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1347] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31c43,
+	.class_hid = BNXT_ULP_CLASS_HID_1e2a7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1348] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a743,
+	.class_hid = BNXT_ULP_CLASS_HID_1ef2f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1349] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21993,
+	.class_hid = BNXT_ULP_CLASS_HID_1a747,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1350] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a493,
+	.class_hid = BNXT_ULP_CLASS_HID_1b3cf,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720968,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1351] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32f93,
+	.class_hid = BNXT_ULP_CLASS_HID_1ad03,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1352] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ba93,
+	.class_hid = BNXT_ULP_CLASS_HID_1b98b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720968,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1353] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24233,
+	.class_hid = BNXT_ULP_CLASS_HID_1a333,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1354] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cd33,
+	.class_hid = BNXT_ULP_CLASS_HID_1afbb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 118,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1355] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35833,
+	.class_hid = BNXT_ULP_CLASS_HID_1a9ff,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 119,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1356] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38607,
+	.class_hid = BNXT_ULP_CLASS_HID_1b667,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 120,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1357] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22ee3,
+	.class_hid = BNXT_ULP_CLASS_HID_1eaeb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 121,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1358] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b9e3,
+	.class_hid = BNXT_ULP_CLASS_HID_1f753,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 121,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720968,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1359] = {
-	.class_hid = BNXT_ULP_CLASS_HID_344e3,
+	.class_hid = BNXT_ULP_CLASS_HID_1f097,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 121,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1360] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cfe3,
+	.class_hid = BNXT_ULP_CLASS_HID_1a0c3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 121,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720968,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1361] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22a37,
+	.class_hid = BNXT_ULP_CLASS_HID_5b7af,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 121,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1362] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b537,
+	.class_hid = BNXT_ULP_CLASS_HID_5e417,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 121,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1363] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34037,
+	.class_hid = BNXT_ULP_CLASS_HID_5be6b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 122,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1364] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cb37,
+	.class_hid = BNXT_ULP_CLASS_HID_5ead3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 123,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1365] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23d07,
+	.class_hid = BNXT_ULP_CLASS_HID_5a20b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1366] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c807,
+	.class_hid = BNXT_ULP_CLASS_HID_5aef3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720968,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1367] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35307,
+	.class_hid = BNXT_ULP_CLASS_HID_5a837,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1368] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3815b,
+	.class_hid = BNXT_ULP_CLASS_HID_5b4bf,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720968,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1369] = {
-	.class_hid = BNXT_ULP_CLASS_HID_208fb,
+	.class_hid = BNXT_ULP_CLASS_HID_5fb33,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1370] = {
-	.class_hid = BNXT_ULP_CLASS_HID_293fb,
+	.class_hid = BNXT_ULP_CLASS_HID_5ab6f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1371] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31efb,
+	.class_hid = BNXT_ULP_CLASS_HID_5a4a3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1372] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a9fb,
+	.class_hid = BNXT_ULP_CLASS_HID_5b12b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1373] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25257,
+	.class_hid = BNXT_ULP_CLASS_HID_5e59f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1374] = {
-	.class_hid = BNXT_ULP_CLASS_HID_280ab,
+	.class_hid = BNXT_ULP_CLASS_HID_5f207,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720968,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1375] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30bab,
+	.class_hid = BNXT_ULP_CLASS_HID_5ec5b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1376] = {
-	.class_hid = BNXT_ULP_CLASS_HID_396ab,
+	.class_hid = BNXT_ULP_CLASS_HID_5f8c3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720968,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1377] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24dab,
+	.class_hid = BNXT_ULP_CLASS_HID_ec7b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1378] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d8ab,
+	.class_hid = BNXT_ULP_CLASS_HID_f8e3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1379] = {
-	.class_hid = BNXT_ULP_CLASS_HID_306ff,
+	.class_hid = BNXT_ULP_CLASS_HID_f227,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1380] = {
-	.class_hid = BNXT_ULP_CLASS_HID_391ff,
+	.class_hid = BNXT_ULP_CLASS_HID_feaf,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1381] = {
-	.class_hid = BNXT_ULP_CLASS_HID_203cf,
+	.class_hid = BNXT_ULP_CLASS_HID_f6c7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1382] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28ecf,
+	.class_hid = BNXT_ULP_CLASS_HID_e34f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1383] = {
-	.class_hid = BNXT_ULP_CLASS_HID_319cf,
+	.class_hid = BNXT_ULP_CLASS_HID_fc83,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1384] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a4cf,
+	.class_hid = BNXT_ULP_CLASS_HID_e90b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1385] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2515b,
+	.class_hid = BNXT_ULP_CLASS_HID_ef8f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1386] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dc5b,
+	.class_hid = BNXT_ULP_CLASS_HID_fc77,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1387] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30aaf,
+	.class_hid = BNXT_ULP_CLASS_HID_f64b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1388] = {
-	.class_hid = BNXT_ULP_CLASS_HID_395af,
+	.class_hid = BNXT_ULP_CLASS_HID_e5e7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1389] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23e0b,
+	.class_hid = BNXT_ULP_CLASS_HID_fa6b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1390] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c90b,
+	.class_hid = BNXT_ULP_CLASS_HID_e6d3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1391] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3540b,
+	.class_hid = BNXT_ULP_CLASS_HID_e017,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1392] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3825f,
+	.class_hid = BNXT_ULP_CLASS_HID_ec9f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1393] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2395f,
+	.class_hid = BNXT_ULP_CLASS_HID_4e72f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1394] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c45f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f397,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1395] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34f5f,
+	.class_hid = BNXT_ULP_CLASS_HID_4edeb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1396] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3da5f,
+	.class_hid = BNXT_ULP_CLASS_HID_4fa53,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1397] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24caf,
+	.class_hid = BNXT_ULP_CLASS_HID_4f18b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1398] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d7af,
+	.class_hid = BNXT_ULP_CLASS_HID_4fe73,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1399] = {
-	.class_hid = BNXT_ULP_CLASS_HID_305e3,
+	.class_hid = BNXT_ULP_CLASS_HID_4f7b7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1400] = {
-	.class_hid = BNXT_ULP_CLASS_HID_390e3,
+	.class_hid = BNXT_ULP_CLASS_HID_4e43f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1401] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21803,
+	.class_hid = BNXT_ULP_CLASS_HID_4eab3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1402] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a303,
+	.class_hid = BNXT_ULP_CLASS_HID_4f73b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1403] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32e03,
+	.class_hid = BNXT_ULP_CLASS_HID_4f17f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1404] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b903,
+	.class_hid = BNXT_ULP_CLASS_HID_4e0ab,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917512,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1405] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20533,
+	.class_hid = BNXT_ULP_CLASS_HID_4f51f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1406] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29033,
+	.class_hid = BNXT_ULP_CLASS_HID_4e187,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1407] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31b33,
+	.class_hid = BNXT_ULP_CLASS_HID_4fbdb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1408] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a633,
+	.class_hid = BNXT_ULP_CLASS_HID_4e843,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1409] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20007,
+	.class_hid = BNXT_ULP_CLASS_HID_1e27b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
-	},
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
 	[1410] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28b07,
+	.class_hid = BNXT_ULP_CLASS_HID_1eee3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1411] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31607,
+	.class_hid = BNXT_ULP_CLASS_HID_1e827,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1412] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a107,
+	.class_hid = BNXT_ULP_CLASS_HID_1f4af,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1413] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21357,
+	.class_hid = BNXT_ULP_CLASS_HID_1ecc7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1414] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29e57,
+	.class_hid = BNXT_ULP_CLASS_HID_1f94f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1415] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32957,
+	.class_hid = BNXT_ULP_CLASS_HID_1f283,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1416] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b457,
+	.class_hid = BNXT_ULP_CLASS_HID_1ff0b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1417] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23bf7,
+	.class_hid = BNXT_ULP_CLASS_HID_1e8b3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1418] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c6f7,
+	.class_hid = BNXT_ULP_CLASS_HID_1f53b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1419] = {
-	.class_hid = BNXT_ULP_CLASS_HID_351f7,
+	.class_hid = BNXT_ULP_CLASS_HID_1ef7f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1420] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dcf7,
+	.class_hid = BNXT_ULP_CLASS_HID_1fbe7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1421] = {
-	.class_hid = BNXT_ULP_CLASS_HID_228a7,
+	.class_hid = BNXT_ULP_CLASS_HID_1f06b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1422] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b3a7,
+	.class_hid = BNXT_ULP_CLASS_HID_1fcd3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1423] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33ea7,
+	.class_hid = BNXT_ULP_CLASS_HID_1f617,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1424] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c9a7,
+	.class_hid = BNXT_ULP_CLASS_HID_1e643,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1425] = {
-	.class_hid = BNXT_ULP_CLASS_HID_223fb,
+	.class_hid = BNXT_ULP_CLASS_HID_5fd2f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1426] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2aefb,
+	.class_hid = BNXT_ULP_CLASS_HID_5e997,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1427] = {
-	.class_hid = BNXT_ULP_CLASS_HID_339fb,
+	.class_hid = BNXT_ULP_CLASS_HID_5e3eb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1428] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c4fb,
+	.class_hid = BNXT_ULP_CLASS_HID_5f053,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1429] = {
-	.class_hid = BNXT_ULP_CLASS_HID_236cb,
+	.class_hid = BNXT_ULP_CLASS_HID_5e78b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1430] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c1cb,
+	.class_hid = BNXT_ULP_CLASS_HID_5f473,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1431] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34ccb,
+	.class_hid = BNXT_ULP_CLASS_HID_5edb7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1432] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d7cb,
+	.class_hid = BNXT_ULP_CLASS_HID_5fa3f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1433] = {
-	.class_hid = BNXT_ULP_CLASS_HID_202bf,
+	.class_hid = BNXT_ULP_CLASS_HID_5e467,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1434] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28dbf,
+	.class_hid = BNXT_ULP_CLASS_HID_5f0ef,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1435] = {
-	.class_hid = BNXT_ULP_CLASS_HID_318bf,
+	.class_hid = BNXT_ULP_CLASS_HID_5ea23,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1436] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a3bf,
+	.class_hid = BNXT_ULP_CLASS_HID_5f6ab,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983048,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1437] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24c1b,
+	.class_hid = BNXT_ULP_CLASS_HID_5eb1f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1438] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d71b,
+	.class_hid = BNXT_ULP_CLASS_HID_5f787,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1439] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3056f,
+	.class_hid = BNXT_ULP_CLASS_HID_5f1db,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1440] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3906f,
+	.class_hid = BNXT_ULP_CLASS_HID_5e177,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983112,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1441] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2476f,
+	.class_hid = BNXT_ULP_CLASS_HID_498d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1442] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d26f,
+	.class_hid = BNXT_ULP_CLASS_HID_4fc9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1443] = {
-	.class_hid = BNXT_ULP_CLASS_HID_300a3,
+	.class_hid = BNXT_ULP_CLASS_HID_0cf9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1444] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38ba3,
+	.class_hid = BNXT_ULP_CLASS_HID_1335,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1445] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25abf,
+	.class_hid = BNXT_ULP_CLASS_HID_232d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1446] = {
-	.class_hid = BNXT_ULP_CLASS_HID_288f3,
+	.class_hid = BNXT_ULP_CLASS_HID_2969,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1447] = {
-	.class_hid = BNXT_ULP_CLASS_HID_313f3,
+	.class_hid = BNXT_ULP_CLASS_HID_4345,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1448] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39ef3,
+	.class_hid = BNXT_ULP_CLASS_HID_4981,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1449] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24b1f,
+	.class_hid = BNXT_ULP_CLASS_HID_45809,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1450] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d61f,
+	.class_hid = BNXT_ULP_CLASS_HID_40179,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1451] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30453,
+	.class_hid = BNXT_ULP_CLASS_HID_431a9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1452] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38f53,
+	.class_hid = BNXT_ULP_CLASS_HID_437d5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1453] = {
-	.class_hid = BNXT_ULP_CLASS_HID_237cf,
+	.class_hid = BNXT_ULP_CLASS_HID_44e61,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1454] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c2cf,
+	.class_hid = BNXT_ULP_CLASS_HID_454ad,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1455] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34dcf,
+	.class_hid = BNXT_ULP_CLASS_HID_42801,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1456] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d8cf,
+	.class_hid = BNXT_ULP_CLASS_HID_42e4d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1457] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23303,
+	.class_hid = BNXT_ULP_CLASS_HID_22c13,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1458] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2be03,
+	.class_hid = BNXT_ULP_CLASS_HID_2322f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1459] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34903,
+	.class_hid = BNXT_ULP_CLASS_HID_2164f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1460] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d403,
+	.class_hid = BNXT_ULP_CLASS_HID_21c8b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1461] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24653,
+	.class_hid = BNXT_ULP_CLASS_HID_24f87,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1462] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d153,
+	.class_hid = BNXT_ULP_CLASS_HID_255c3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1463] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35c53,
+	.class_hid = BNXT_ULP_CLASS_HID_239e3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1464] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38aa7,
+	.class_hid = BNXT_ULP_CLASS_HID_2403f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1465] = {
-	.class_hid = BNXT_ULP_CLASS_HID_211c7,
+	.class_hid = BNXT_ULP_CLASS_HID_218c3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1466] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29cc7,
+	.class_hid = BNXT_ULP_CLASS_HID_21f1f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1467] = {
-	.class_hid = BNXT_ULP_CLASS_HID_327c7,
+	.class_hid = BNXT_ULP_CLASS_HID_2033f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1468] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b2c7,
+	.class_hid = BNXT_ULP_CLASS_HID_2097b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1469] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25ba3,
+	.class_hid = BNXT_ULP_CLASS_HID_23c77,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1470] = {
-	.class_hid = BNXT_ULP_CLASS_HID_289f7,
+	.class_hid = BNXT_ULP_CLASS_HID_242b3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1471] = {
-	.class_hid = BNXT_ULP_CLASS_HID_314f7,
+	.class_hid = BNXT_ULP_CLASS_HID_226d3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1472] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39ff7,
+	.class_hid = BNXT_ULP_CLASS_HID_22cef,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1473] = {
-	.class_hid = BNXT_ULP_CLASS_HID_256f7,
+	.class_hid = BNXT_ULP_CLASS_HID_62727,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1474] = {
-	.class_hid = BNXT_ULP_CLASS_HID_284cb,
+	.class_hid = BNXT_ULP_CLASS_HID_62d63,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1475] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30fcb,
+	.class_hid = BNXT_ULP_CLASS_HID_61183,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1476] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39acb,
+	.class_hid = BNXT_ULP_CLASS_HID_617df,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1477] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20d1b,
+	.class_hid = BNXT_ULP_CLASS_HID_64adb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1478] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2981b,
+	.class_hid = BNXT_ULP_CLASS_HID_65117,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1479] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3231b,
+	.class_hid = BNXT_ULP_CLASS_HID_63537,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1480] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ae1b,
+	.class_hid = BNXT_ULP_CLASS_HID_63b73,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1481] = {
-	.class_hid = BNXT_ULP_CLASS_HID_235bb,
+	.class_hid = BNXT_ULP_CLASS_HID_61417,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1482] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c0bb,
+	.class_hid = BNXT_ULP_CLASS_HID_61a53,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 124,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1483] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34bbb,
+	.class_hid = BNXT_ULP_CLASS_HID_65b3f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 125,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1484] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d6bb,
+	.class_hid = BNXT_ULP_CLASS_HID_6048f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 126,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1485] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2226b,
+	.class_hid = BNXT_ULP_CLASS_HID_6378b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 127,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1486] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ad6b,
+	.class_hid = BNXT_ULP_CLASS_HID_63dc7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 127,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1487] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3386b,
+	.class_hid = BNXT_ULP_CLASS_HID_621e7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 127,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1488] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c36b,
+	.class_hid = BNXT_ULP_CLASS_HID_62823,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 127,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1489] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21dbf,
+	.class_hid = BNXT_ULP_CLASS_HID_8b0b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 127,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1490] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a8bf,
+	.class_hid = BNXT_ULP_CLASS_HID_9137,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 127,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1491] = {
-	.class_hid = BNXT_ULP_CLASS_HID_333bf,
+	.class_hid = BNXT_ULP_CLASS_HID_d223,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 128,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1492] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bebf,
+	.class_hid = BNXT_ULP_CLASS_HID_d86f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 129,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1493] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2308f,
+	.class_hid = BNXT_ULP_CLASS_HID_ae9f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1494] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bb8f,
+	.class_hid = BNXT_ULP_CLASS_HID_b4db,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1495] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3468f,
+	.class_hid = BNXT_ULP_CLASS_HID_98fb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1496] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d18f,
+	.class_hid = BNXT_ULP_CLASS_HID_9f27,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1497] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2592f,
+	.class_hid = BNXT_ULP_CLASS_HID_4863f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1498] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28763,
+	.class_hid = BNXT_ULP_CLASS_HID_48c7b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1499] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31263,
+	.class_hid = BNXT_ULP_CLASS_HID_4cd57,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1500] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39d63,
+	.class_hid = BNXT_ULP_CLASS_HID_4d393,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1501] = {
-	.class_hid = BNXT_ULP_CLASS_HID_245df,
+	.class_hid = BNXT_ULP_CLASS_HID_4a9c3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1502] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d0df,
+	.class_hid = BNXT_ULP_CLASS_HID_4b00f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1503] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35bdf,
+	.class_hid = BNXT_ULP_CLASS_HID_4942f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1504] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38a13,
+	.class_hid = BNXT_ULP_CLASS_HID_49a6b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1505] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24113,
+	.class_hid = BNXT_ULP_CLASS_HID_1a10b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1506] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cc13,
+	.class_hid = BNXT_ULP_CLASS_HID_1a737,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1507] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35713,
+	.class_hid = BNXT_ULP_CLASS_HID_18b57,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1508] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38567,
+	.class_hid = BNXT_ULP_CLASS_HID_19193,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1509] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25463,
+	.class_hid = BNXT_ULP_CLASS_HID_1c49f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1510] = {
-	.class_hid = BNXT_ULP_CLASS_HID_282b7,
+	.class_hid = BNXT_ULP_CLASS_HID_1cadb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1511] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30db7,
+	.class_hid = BNXT_ULP_CLASS_HID_1aefb,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1512] = {
-	.class_hid = BNXT_ULP_CLASS_HID_398b7,
+	.class_hid = BNXT_ULP_CLASS_HID_1b527,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1513] = {
-	.class_hid = BNXT_ULP_CLASS_HID_244c3,
+	.class_hid = BNXT_ULP_CLASS_HID_59c3f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1514] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cfc3,
+	.class_hid = BNXT_ULP_CLASS_HID_5a27b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1515] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35ac3,
+	.class_hid = BNXT_ULP_CLASS_HID_5869b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1516] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38917,
+	.class_hid = BNXT_ULP_CLASS_HID_58cc7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1517] = {
-	.class_hid = BNXT_ULP_CLASS_HID_231f3,
+	.class_hid = BNXT_ULP_CLASS_HID_5bfc3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1518] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bcf3,
+	.class_hid = BNXT_ULP_CLASS_HID_5c60f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1519] = {
-	.class_hid = BNXT_ULP_CLASS_HID_347f3,
+	.class_hid = BNXT_ULP_CLASS_HID_5aa2f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1520] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d2f3,
+	.class_hid = BNXT_ULP_CLASS_HID_5b06b,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1521] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22cc7,
+	.class_hid = BNXT_ULP_CLASS_HID_49ad,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1522] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b7c7,
+	.class_hid = BNXT_ULP_CLASS_HID_4fe9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1523] = {
-	.class_hid = BNXT_ULP_CLASS_HID_342c7,
+	.class_hid = BNXT_ULP_CLASS_HID_0cd9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1524] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cdc7,
+	.class_hid = BNXT_ULP_CLASS_HID_1315,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1525] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24017,
+	.class_hid = BNXT_ULP_CLASS_HID_230d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1526] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cb17,
+	.class_hid = BNXT_ULP_CLASS_HID_2949,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1527] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35617,
+	.class_hid = BNXT_ULP_CLASS_HID_4365,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1528] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3846b,
+	.class_hid = BNXT_ULP_CLASS_HID_49a1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1529] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20b8b,
+	.class_hid = BNXT_ULP_CLASS_HID_4035,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1530] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2968b,
+	.class_hid = BNXT_ULP_CLASS_HID_4671,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1531] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3218b,
+	.class_hid = BNXT_ULP_CLASS_HID_0361,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1532] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ac8b,
+	.class_hid = BNXT_ULP_CLASS_HID_09bd,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1533] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25567,
+	.class_hid = BNXT_ULP_CLASS_HID_1995,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1534] = {
-	.class_hid = BNXT_ULP_CLASS_HID_283bb,
+	.class_hid = BNXT_ULP_CLASS_HID_1fd1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1535] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30ebb,
+	.class_hid = BNXT_ULP_CLASS_HID_398d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1536] = {
-	.class_hid = BNXT_ULP_CLASS_HID_399bb,
+	.class_hid = BNXT_ULP_CLASS_HID_3fc9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1537] = {
-	.class_hid = BNXT_ULP_CLASS_HID_250bb,
+	.class_hid = BNXT_ULP_CLASS_HID_444e1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1538] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dbbb,
+	.class_hid = BNXT_ULP_CLASS_HID_44b3d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1539] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3098f,
+	.class_hid = BNXT_ULP_CLASS_HID_4082d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1540] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3948f,
+	.class_hid = BNXT_ULP_CLASS_HID_40e69,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1541] = {
-	.class_hid = BNXT_ULP_CLASS_HID_206df,
+	.class_hid = BNXT_ULP_CLASS_HID_41e41,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1542] = {
-	.class_hid = BNXT_ULP_CLASS_HID_291df,
+	.class_hid = BNXT_ULP_CLASS_HID_4249d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1543] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31cdf,
+	.class_hid = BNXT_ULP_CLASS_HID_43eb9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1544] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a7df,
+	.class_hid = BNXT_ULP_CLASS_HID_444f5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1545] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22f7f,
+	.class_hid = BNXT_ULP_CLASS_HID_43b09,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1546] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ba7f,
+	.class_hid = BNXT_ULP_CLASS_HID_44145,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1547] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3457f,
+	.class_hid = BNXT_ULP_CLASS_HID_45b61,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1548] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d07f,
+	.class_hid = BNXT_ULP_CLASS_HID_404f1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1549] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21c2f,
+	.class_hid = BNXT_ULP_CLASS_HID_414e9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1550] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a72f,
+	.class_hid = BNXT_ULP_CLASS_HID_41b25,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1551] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3322f,
+	.class_hid = BNXT_ULP_CLASS_HID_434c1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1552] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bd2f,
+	.class_hid = BNXT_ULP_CLASS_HID_43b1d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1553] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21763,
+	.class_hid = BNXT_ULP_CLASS_HID_45829,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1554] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a263,
+	.class_hid = BNXT_ULP_CLASS_HID_40159,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1555] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32d63,
+	.class_hid = BNXT_ULP_CLASS_HID_43189,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1556] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b863,
+	.class_hid = BNXT_ULP_CLASS_HID_437f5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1557] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22ab3,
+	.class_hid = BNXT_ULP_CLASS_HID_44e41,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1558] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b5b3,
+	.class_hid = BNXT_ULP_CLASS_HID_4548d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1559] = {
-	.class_hid = BNXT_ULP_CLASS_HID_340b3,
+	.class_hid = BNXT_ULP_CLASS_HID_42821,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1560] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cbb3,
+	.class_hid = BNXT_ULP_CLASS_HID_42e6d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1561] = {
-	.class_hid = BNXT_ULP_CLASS_HID_252d3,
+	.class_hid = BNXT_ULP_CLASS_HID_6271d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1562] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28127,
+	.class_hid = BNXT_ULP_CLASS_HID_62d59,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1563] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30c27,
+	.class_hid = BNXT_ULP_CLASS_HID_600fd,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1564] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39727,
+	.class_hid = BNXT_ULP_CLASS_HID_60739,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1565] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23f83,
+	.class_hid = BNXT_ULP_CLASS_HID_61db5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1566] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ca83,
+	.class_hid = BNXT_ULP_CLASS_HID_623f1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1567] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35583,
+	.class_hid = BNXT_ULP_CLASS_HID_65421,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1568] = {
-	.class_hid = BNXT_ULP_CLASS_HID_383d7,
+	.class_hid = BNXT_ULP_CLASS_HID_65a6d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1569] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23ad7,
+	.class_hid = BNXT_ULP_CLASS_HID_5111d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1570] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c5d7,
+	.class_hid = BNXT_ULP_CLASS_HID_51759,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1571] = {
-	.class_hid = BNXT_ULP_CLASS_HID_350d7,
+	.class_hid = BNXT_ULP_CLASS_HID_54789,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1572] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dbd7,
+	.class_hid = BNXT_ULP_CLASS_HID_54df5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1573] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24e27,
+	.class_hid = BNXT_ULP_CLASS_HID_507b5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1574] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d927,
+	.class_hid = BNXT_ULP_CLASS_HID_50df1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1575] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3077b,
+	.class_hid = BNXT_ULP_CLASS_HID_53e21,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1576] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3927b,
+	.class_hid = BNXT_ULP_CLASS_HID_5446d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1577] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2320f,
+	.class_hid = BNXT_ULP_CLASS_HID_73d1d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1578] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bd0f,
+	.class_hid = BNXT_ULP_CLASS_HID_74359,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1579] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3480f,
+	.class_hid = BNXT_ULP_CLASS_HID_716fd,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1580] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d30f,
+	.class_hid = BNXT_ULP_CLASS_HID_71d39,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1581] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21f3f,
+	.class_hid = BNXT_ULP_CLASS_HID_733b5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1582] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2aa3f,
+	.class_hid = BNXT_ULP_CLASS_HID_739f1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1583] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3353f,
+	.class_hid = BNXT_ULP_CLASS_HID_70d15,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1584] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c03f,
+	.class_hid = BNXT_ULP_CLASS_HID_71351,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1585] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21a73,
+	.class_hid = BNXT_ULP_CLASS_HID_49cd,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1586] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a573,
+	.class_hid = BNXT_ULP_CLASS_HID_4f89,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1587] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33073,
+	.class_hid = BNXT_ULP_CLASS_HID_0cb9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1588] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bb73,
+	.class_hid = BNXT_ULP_CLASS_HID_1375,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1589] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22d43,
+	.class_hid = BNXT_ULP_CLASS_HID_236d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1590] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b843,
+	.class_hid = BNXT_ULP_CLASS_HID_2929,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1591] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34343,
+	.class_hid = BNXT_ULP_CLASS_HID_4305,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1592] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ce43,
+	.class_hid = BNXT_ULP_CLASS_HID_49c1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1593] = {
-	.class_hid = BNXT_ULP_CLASS_HID_255e3,
+	.class_hid = BNXT_ULP_CLASS_HID_4055,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1594] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28437,
+	.class_hid = BNXT_ULP_CLASS_HID_4611,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1595] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30f37,
+	.class_hid = BNXT_ULP_CLASS_HID_0301,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1596] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39a37,
+	.class_hid = BNXT_ULP_CLASS_HID_09dd,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1597] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24293,
+	.class_hid = BNXT_ULP_CLASS_HID_19f5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1598] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cd93,
+	.class_hid = BNXT_ULP_CLASS_HID_1fb1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1599] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35893,
+	.class_hid = BNXT_ULP_CLASS_HID_39ed,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1600] = {
-	.class_hid = BNXT_ULP_CLASS_HID_386e7,
+	.class_hid = BNXT_ULP_CLASS_HID_3fa9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1601] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23de7,
+	.class_hid = BNXT_ULP_CLASS_HID_44481,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1602] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c8e7,
+	.class_hid = BNXT_ULP_CLASS_HID_44b5d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1603] = {
-	.class_hid = BNXT_ULP_CLASS_HID_353e7,
+	.class_hid = BNXT_ULP_CLASS_HID_4084d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1604] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3823b,
+	.class_hid = BNXT_ULP_CLASS_HID_40e09,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1605] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25137,
+	.class_hid = BNXT_ULP_CLASS_HID_41e21,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1606] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dc37,
+	.class_hid = BNXT_ULP_CLASS_HID_424fd,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1607] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30a0b,
+	.class_hid = BNXT_ULP_CLASS_HID_43ed9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1608] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3950b,
+	.class_hid = BNXT_ULP_CLASS_HID_44495,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1609] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c33,
+	.class_hid = BNXT_ULP_CLASS_HID_43b69,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1610] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b733,
+	.class_hid = BNXT_ULP_CLASS_HID_44125,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1611] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34233,
+	.class_hid = BNXT_ULP_CLASS_HID_45b01,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1612] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cd33,
+	.class_hid = BNXT_ULP_CLASS_HID_40491,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1613] = {
-	.class_hid = BNXT_ULP_CLASS_HID_218e3,
+	.class_hid = BNXT_ULP_CLASS_HID_41489,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1614] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a3e3,
+	.class_hid = BNXT_ULP_CLASS_HID_41b45,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1615] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32ee3,
+	.class_hid = BNXT_ULP_CLASS_HID_434a1,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1616] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b9e3,
+	.class_hid = BNXT_ULP_CLASS_HID_43b7d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1617] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21437,
+	.class_hid = BNXT_ULP_CLASS_HID_45849,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1618] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29f37,
+	.class_hid = BNXT_ULP_CLASS_HID_40139,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1619] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32a37,
+	.class_hid = BNXT_ULP_CLASS_HID_431e9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1620] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b537,
+	.class_hid = BNXT_ULP_CLASS_HID_43795,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1621] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22707,
+	.class_hid = BNXT_ULP_CLASS_HID_44e21,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1622] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b207,
+	.class_hid = BNXT_ULP_CLASS_HID_454ed,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1623] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33d07,
+	.class_hid = BNXT_ULP_CLASS_HID_42841,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1624] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c807,
+	.class_hid = BNXT_ULP_CLASS_HID_42e0d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1625] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24fa7,
+	.class_hid = BNXT_ULP_CLASS_HID_6277d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1626] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2daa7,
+	.class_hid = BNXT_ULP_CLASS_HID_62d39,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1627] = {
-	.class_hid = BNXT_ULP_CLASS_HID_308fb,
+	.class_hid = BNXT_ULP_CLASS_HID_6009d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1628] = {
-	.class_hid = BNXT_ULP_CLASS_HID_393fb,
+	.class_hid = BNXT_ULP_CLASS_HID_60759,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1629] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23c57,
+	.class_hid = BNXT_ULP_CLASS_HID_61dd5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1630] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c757,
+	.class_hid = BNXT_ULP_CLASS_HID_62391,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1631] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35257,
+	.class_hid = BNXT_ULP_CLASS_HID_65441,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1632] = {
-	.class_hid = BNXT_ULP_CLASS_HID_380ab,
+	.class_hid = BNXT_ULP_CLASS_HID_65a0d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1633] = {
-	.class_hid = BNXT_ULP_CLASS_HID_237ab,
+	.class_hid = BNXT_ULP_CLASS_HID_5117d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1634] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c2ab,
+	.class_hid = BNXT_ULP_CLASS_HID_51739,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1635] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34dab,
+	.class_hid = BNXT_ULP_CLASS_HID_547e9,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1636] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d8ab,
+	.class_hid = BNXT_ULP_CLASS_HID_54d95,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1637] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24afb,
+	.class_hid = BNXT_ULP_CLASS_HID_507d5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1638] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d5fb,
+	.class_hid = BNXT_ULP_CLASS_HID_50d91,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1639] = {
-	.class_hid = BNXT_ULP_CLASS_HID_303cf,
+	.class_hid = BNXT_ULP_CLASS_HID_53e41,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1640] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38ecf,
+	.class_hid = BNXT_ULP_CLASS_HID_5440d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1641] = {
-	.class_hid = BNXT_ULP_CLASS_HID_255b,
+	.class_hid = BNXT_ULP_CLASS_HID_73d7d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1642] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b97,
+	.class_hid = BNXT_ULP_CLASS_HID_74339,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1643] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1847,
+	.class_hid = BNXT_ULP_CLASS_HID_7169d,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1644] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4f0b,
+	.class_hid = BNXT_ULP_CLASS_HID_71d59,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1645] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c3b,
+	.class_hid = BNXT_ULP_CLASS_HID_733d5,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1646] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1633,
+	.class_hid = BNXT_ULP_CLASS_HID_73991,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1647] = {
-	.class_hid = BNXT_ULP_CLASS_HID_02e3,
+	.class_hid = BNXT_ULP_CLASS_HID_70d75,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1648] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39a7,
+	.class_hid = BNXT_ULP_CLASS_HID_71331,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1649] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2657,
+	.class_hid = BNXT_ULP_CLASS_HID_22c33,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -36401,20 +37549,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1650] = {
-	.class_hid = BNXT_ULP_CLASS_HID_120b,
+	.class_hid = BNXT_ULP_CLASS_HID_2320f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -36422,17 +37565,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1651] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48cf,
+	.class_hid = BNXT_ULP_CLASS_HID_2166f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -36440,17 +37582,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1652] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35ff,
+	.class_hid = BNXT_ULP_CLASS_HID_21cab,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -36458,18 +37599,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1653] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0ff7,
+	.class_hid = BNXT_ULP_CLASS_HID_24fa7,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -36477,17 +37617,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1654] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5953,
+	.class_hid = BNXT_ULP_CLASS_HID_255e3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -36495,18 +37634,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1655] = {
-	.class_hid = BNXT_ULP_CLASS_HID_336b,
+	.class_hid = BNXT_ULP_CLASS_HID_239c3,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -36514,18 +37652,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1656] = {
-	.class_hid = BNXT_ULP_CLASS_HID_201b,
+	.class_hid = BNXT_ULP_CLASS_HID_2401f,
 	.class_tid = 1,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -36533,5223 +37670,4870 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1657] = {
-	.class_hid = BNXT_ULP_CLASS_HID_257f7,
+	.class_hid = BNXT_ULP_CLASS_HID_218e3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1658] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2858b,
+	.class_hid = BNXT_ULP_CLASS_HID_21f3f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1659] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3108b,
+	.class_hid = BNXT_ULP_CLASS_HID_2031f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1660] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39b8b,
+	.class_hid = BNXT_ULP_CLASS_HID_2095b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1661] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24427,
+	.class_hid = BNXT_ULP_CLASS_HID_23c57,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1662] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cf27,
+	.class_hid = BNXT_ULP_CLASS_HID_24293,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1663] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35a27,
+	.class_hid = BNXT_ULP_CLASS_HID_226f3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1664] = {
-	.class_hid = BNXT_ULP_CLASS_HID_388fb,
+	.class_hid = BNXT_ULP_CLASS_HID_22ccf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1665] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23ffb,
+	.class_hid = BNXT_ULP_CLASS_HID_62707,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1666] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cafb,
+	.class_hid = BNXT_ULP_CLASS_HID_62d43,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1667] = {
-	.class_hid = BNXT_ULP_CLASS_HID_355fb,
+	.class_hid = BNXT_ULP_CLASS_HID_611a3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1668] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3838f,
+	.class_hid = BNXT_ULP_CLASS_HID_617ff,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1669] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2528b,
+	.class_hid = BNXT_ULP_CLASS_HID_64afb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1670] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2815f,
+	.class_hid = BNXT_ULP_CLASS_HID_65137,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1671] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30c5f,
+	.class_hid = BNXT_ULP_CLASS_HID_63517,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1672] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3975f,
+	.class_hid = BNXT_ULP_CLASS_HID_63b53,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1673] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21e3f,
+	.class_hid = BNXT_ULP_CLASS_HID_61437,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1674] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a93f,
+	.class_hid = BNXT_ULP_CLASS_HID_61a73,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1675] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3343f,
+	.class_hid = BNXT_ULP_CLASS_HID_65b1f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1676] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bf3f,
+	.class_hid = BNXT_ULP_CLASS_HID_604af,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1677] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20b6f,
+	.class_hid = BNXT_ULP_CLASS_HID_637ab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1678] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2966f,
+	.class_hid = BNXT_ULP_CLASS_HID_63de7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1679] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3216f,
+	.class_hid = BNXT_ULP_CLASS_HID_621c7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1680] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ac6f,
+	.class_hid = BNXT_ULP_CLASS_HID_62803,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1681] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20623,
+	.class_hid = BNXT_ULP_CLASS_HID_34233,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1682] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29123,
+	.class_hid = BNXT_ULP_CLASS_HID_3480f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1683] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31c23,
+	.class_hid = BNXT_ULP_CLASS_HID_32c6f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1684] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a723,
+	.class_hid = BNXT_ULP_CLASS_HID_332ab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1685] = {
-	.class_hid = BNXT_ULP_CLASS_HID_219f3,
+	.class_hid = BNXT_ULP_CLASS_HID_308fb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1686] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a4f3,
+	.class_hid = BNXT_ULP_CLASS_HID_30f37,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1687] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32ff3,
+	.class_hid = BNXT_ULP_CLASS_HID_34fc3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1688] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3baf3,
+	.class_hid = BNXT_ULP_CLASS_HID_3561f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1689] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24253,
+	.class_hid = BNXT_ULP_CLASS_HID_32ee3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1690] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cd53,
+	.class_hid = BNXT_ULP_CLASS_HID_3353f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 130,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1691] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35853,
+	.class_hid = BNXT_ULP_CLASS_HID_3191f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 131,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1692] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38667,
+	.class_hid = BNXT_ULP_CLASS_HID_31f5b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 132,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1693] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22e83,
+	.class_hid = BNXT_ULP_CLASS_HID_35257,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 133,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1694] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b983,
+	.class_hid = BNXT_ULP_CLASS_HID_35893,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 133,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1695] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34483,
+	.class_hid = BNXT_ULP_CLASS_HID_33cf3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 133,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1696] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cf83,
+	.class_hid = BNXT_ULP_CLASS_HID_342cf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 133,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1697] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22a57,
+	.class_hid = BNXT_ULP_CLASS_HID_73d07,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 133,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1698] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b557,
+	.class_hid = BNXT_ULP_CLASS_HID_74343,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 133,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1699] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34057,
+	.class_hid = BNXT_ULP_CLASS_HID_727a3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 134,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1700] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cb57,
+	.class_hid = BNXT_ULP_CLASS_HID_72dff,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 135,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1701] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23d67,
+	.class_hid = BNXT_ULP_CLASS_HID_703cf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1702] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c867,
+	.class_hid = BNXT_ULP_CLASS_HID_70a0b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1703] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35367,
+	.class_hid = BNXT_ULP_CLASS_HID_74b17,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1704] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3813b,
+	.class_hid = BNXT_ULP_CLASS_HID_75153,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1705] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2089b,
+	.class_hid = BNXT_ULP_CLASS_HID_72a37,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1706] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2939b,
+	.class_hid = BNXT_ULP_CLASS_HID_73073,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1707] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31e9b,
+	.class_hid = BNXT_ULP_CLASS_HID_71453,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1708] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a99b,
+	.class_hid = BNXT_ULP_CLASS_HID_71aaf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1709] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25237,
+	.class_hid = BNXT_ULP_CLASS_HID_74dab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1710] = {
-	.class_hid = BNXT_ULP_CLASS_HID_280cb,
+	.class_hid = BNXT_ULP_CLASS_HID_753e7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1711] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30bcb,
+	.class_hid = BNXT_ULP_CLASS_HID_737c7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1712] = {
-	.class_hid = BNXT_ULP_CLASS_HID_396cb,
+	.class_hid = BNXT_ULP_CLASS_HID_73e03,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1713] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24dcb,
+	.class_hid = BNXT_ULP_CLASS_HID_2b733,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1714] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d8cb,
+	.class_hid = BNXT_ULP_CLASS_HID_2bd0f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1715] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3069f,
+	.class_hid = BNXT_ULP_CLASS_HID_2a16f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1716] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3919f,
+	.class_hid = BNXT_ULP_CLASS_HID_2a7ab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1717] = {
-	.class_hid = BNXT_ULP_CLASS_HID_203af,
+	.class_hid = BNXT_ULP_CLASS_HID_2daa7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1718] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28eaf,
+	.class_hid = BNXT_ULP_CLASS_HID_28437,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1719] = {
-	.class_hid = BNXT_ULP_CLASS_HID_319af,
+	.class_hid = BNXT_ULP_CLASS_HID_2c4c3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1720] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a4af,
+	.class_hid = BNXT_ULP_CLASS_HID_2cb1f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1721] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2513b,
+	.class_hid = BNXT_ULP_CLASS_HID_2a3e3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1722] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dc3b,
+	.class_hid = BNXT_ULP_CLASS_HID_2aa3f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1723] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30acf,
+	.class_hid = BNXT_ULP_CLASS_HID_28e1f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1724] = {
-	.class_hid = BNXT_ULP_CLASS_HID_395cf,
+	.class_hid = BNXT_ULP_CLASS_HID_2945b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1725] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23e6b,
+	.class_hid = BNXT_ULP_CLASS_HID_2c757,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1726] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c96b,
+	.class_hid = BNXT_ULP_CLASS_HID_2cd93,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1727] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3546b,
+	.class_hid = BNXT_ULP_CLASS_HID_2b1f3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1728] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3823f,
+	.class_hid = BNXT_ULP_CLASS_HID_2b7cf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1729] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2393f,
+	.class_hid = BNXT_ULP_CLASS_HID_6b207,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1730] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c43f,
+	.class_hid = BNXT_ULP_CLASS_HID_6b843,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1731] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34f3f,
+	.class_hid = BNXT_ULP_CLASS_HID_69ca3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1732] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3da3f,
+	.class_hid = BNXT_ULP_CLASS_HID_6a2ff,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1733] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24ccf,
+	.class_hid = BNXT_ULP_CLASS_HID_6d5fb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1734] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d7cf,
+	.class_hid = BNXT_ULP_CLASS_HID_6dc37,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1735] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30583,
+	.class_hid = BNXT_ULP_CLASS_HID_6c017,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1736] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39083,
+	.class_hid = BNXT_ULP_CLASS_HID_6c653,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1737] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21863,
+	.class_hid = BNXT_ULP_CLASS_HID_69f37,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1738] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a363,
+	.class_hid = BNXT_ULP_CLASS_HID_6a573,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1739] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32e63,
+	.class_hid = BNXT_ULP_CLASS_HID_68953,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1740] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b963,
+	.class_hid = BNXT_ULP_CLASS_HID_68faf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1741] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20553,
+	.class_hid = BNXT_ULP_CLASS_HID_6c2ab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1742] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29053,
+	.class_hid = BNXT_ULP_CLASS_HID_6c8e7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1743] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31b53,
+	.class_hid = BNXT_ULP_CLASS_HID_6acc7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1744] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a653,
+	.class_hid = BNXT_ULP_CLASS_HID_6b303,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1745] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20067,
+	.class_hid = BNXT_ULP_CLASS_HID_3cd33,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1746] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28b67,
+	.class_hid = BNXT_ULP_CLASS_HID_3d30f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1747] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31667,
+	.class_hid = BNXT_ULP_CLASS_HID_3b76f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1748] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a167,
+	.class_hid = BNXT_ULP_CLASS_HID_3bdab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1749] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21337,
+	.class_hid = BNXT_ULP_CLASS_HID_393fb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1750] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29e37,
+	.class_hid = BNXT_ULP_CLASS_HID_39a37,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1751] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32937,
+	.class_hid = BNXT_ULP_CLASS_HID_3dac3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1752] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b437,
+	.class_hid = BNXT_ULP_CLASS_HID_38453,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1753] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23b97,
+	.class_hid = BNXT_ULP_CLASS_HID_3b9e3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1754] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c697,
+	.class_hid = BNXT_ULP_CLASS_HID_3c03f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1755] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35197,
+	.class_hid = BNXT_ULP_CLASS_HID_3a41f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1756] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dc97,
+	.class_hid = BNXT_ULP_CLASS_HID_3aa5b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1757] = {
-	.class_hid = BNXT_ULP_CLASS_HID_228c7,
+	.class_hid = BNXT_ULP_CLASS_HID_380ab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1758] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b3c7,
+	.class_hid = BNXT_ULP_CLASS_HID_386e7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1759] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33ec7,
+	.class_hid = BNXT_ULP_CLASS_HID_3c7f3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1760] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c9c7,
+	.class_hid = BNXT_ULP_CLASS_HID_3cdcf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1761] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2239b,
+	.class_hid = BNXT_ULP_CLASS_HID_7c807,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1762] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ae9b,
+	.class_hid = BNXT_ULP_CLASS_HID_7ce43,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1763] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3399b,
+	.class_hid = BNXT_ULP_CLASS_HID_7b2a3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1764] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c49b,
+	.class_hid = BNXT_ULP_CLASS_HID_7b8ff,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1765] = {
-	.class_hid = BNXT_ULP_CLASS_HID_236ab,
+	.class_hid = BNXT_ULP_CLASS_HID_78ecf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1766] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c1ab,
+	.class_hid = BNXT_ULP_CLASS_HID_7950b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1767] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34cab,
+	.class_hid = BNXT_ULP_CLASS_HID_7d617,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1768] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d7ab,
+	.class_hid = BNXT_ULP_CLASS_HID_7dc53,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1769] = {
-	.class_hid = BNXT_ULP_CLASS_HID_202df,
+	.class_hid = BNXT_ULP_CLASS_HID_7b537,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1770] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28ddf,
+	.class_hid = BNXT_ULP_CLASS_HID_7bb73,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1771] = {
-	.class_hid = BNXT_ULP_CLASS_HID_318df,
+	.class_hid = BNXT_ULP_CLASS_HID_79f53,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1772] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a3df,
+	.class_hid = BNXT_ULP_CLASS_HID_7a5af,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1773] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24c7b,
+	.class_hid = BNXT_ULP_CLASS_HID_7d8ab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1774] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d77b,
+	.class_hid = BNXT_ULP_CLASS_HID_7823b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1775] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3050f,
+	.class_hid = BNXT_ULP_CLASS_HID_7c2c7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1776] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3900f,
+	.class_hid = BNXT_ULP_CLASS_HID_7c903,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1777] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2470f,
+	.class_hid = BNXT_ULP_CLASS_HID_8b2b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1778] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d20f,
+	.class_hid = BNXT_ULP_CLASS_HID_9117,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1779] = {
-	.class_hid = BNXT_ULP_CLASS_HID_300c3,
+	.class_hid = BNXT_ULP_CLASS_HID_d203,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1780] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38bc3,
+	.class_hid = BNXT_ULP_CLASS_HID_d84f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1781] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25adf,
+	.class_hid = BNXT_ULP_CLASS_HID_aebf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1782] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28893,
+	.class_hid = BNXT_ULP_CLASS_HID_b4fb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1783] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31393,
+	.class_hid = BNXT_ULP_CLASS_HID_98db,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1784] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39e93,
+	.class_hid = BNXT_ULP_CLASS_HID_9f07,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1785] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24b7f,
+	.class_hid = BNXT_ULP_CLASS_HID_4861f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1786] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d67f,
+	.class_hid = BNXT_ULP_CLASS_HID_48c5b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1787] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30433,
+	.class_hid = BNXT_ULP_CLASS_HID_4cd77,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1788] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38f33,
+	.class_hid = BNXT_ULP_CLASS_HID_4d3b3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1789] = {
-	.class_hid = BNXT_ULP_CLASS_HID_237af,
+	.class_hid = BNXT_ULP_CLASS_HID_4a9e3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1790] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c2af,
+	.class_hid = BNXT_ULP_CLASS_HID_4b02f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1791] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34daf,
+	.class_hid = BNXT_ULP_CLASS_HID_4940f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1792] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d8af,
+	.class_hid = BNXT_ULP_CLASS_HID_49a4b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1793] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23363,
+	.class_hid = BNXT_ULP_CLASS_HID_1a12b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1794] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2be63,
+	.class_hid = BNXT_ULP_CLASS_HID_1a717,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1795] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34963,
+	.class_hid = BNXT_ULP_CLASS_HID_18b77,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1796] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d463,
+	.class_hid = BNXT_ULP_CLASS_HID_191b3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1797] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24633,
+	.class_hid = BNXT_ULP_CLASS_HID_1c4bf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1798] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d133,
+	.class_hid = BNXT_ULP_CLASS_HID_1cafb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1799] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35c33,
+	.class_hid = BNXT_ULP_CLASS_HID_1aedb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1800] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38ac7,
+	.class_hid = BNXT_ULP_CLASS_HID_1b507,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1801] = {
-	.class_hid = BNXT_ULP_CLASS_HID_211a7,
+	.class_hid = BNXT_ULP_CLASS_HID_59c1f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1802] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29ca7,
+	.class_hid = BNXT_ULP_CLASS_HID_5a25b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1803] = {
-	.class_hid = BNXT_ULP_CLASS_HID_327a7,
+	.class_hid = BNXT_ULP_CLASS_HID_586bb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1804] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b2a7,
+	.class_hid = BNXT_ULP_CLASS_HID_58ce7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1805] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25bc3,
+	.class_hid = BNXT_ULP_CLASS_HID_5bfe3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1806] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28997,
+	.class_hid = BNXT_ULP_CLASS_HID_5c62f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1807] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31497,
+	.class_hid = BNXT_ULP_CLASS_HID_5aa0f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1808] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39f97,
+	.class_hid = BNXT_ULP_CLASS_HID_5b04b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1809] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25697,
+	.class_hid = BNXT_ULP_CLASS_HID_d0ab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1810] = {
-	.class_hid = BNXT_ULP_CLASS_HID_284ab,
+	.class_hid = BNXT_ULP_CLASS_HID_d697,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1811] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30fab,
+	.class_hid = BNXT_ULP_CLASS_HID_d783,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1812] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39aab,
+	.class_hid = BNXT_ULP_CLASS_HID_c133,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1813] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20d7b,
+	.class_hid = BNXT_ULP_CLASS_HID_f43f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1814] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2987b,
+	.class_hid = BNXT_ULP_CLASS_HID_fa7b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1815] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3237b,
+	.class_hid = BNXT_ULP_CLASS_HID_de5b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1816] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ae7b,
+	.class_hid = BNXT_ULP_CLASS_HID_e487,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1817] = {
-	.class_hid = BNXT_ULP_CLASS_HID_235db,
+	.class_hid = BNXT_ULP_CLASS_HID_4cb9f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1818] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c0db,
+	.class_hid = BNXT_ULP_CLASS_HID_4d1db,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 136,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1819] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34bdb,
+	.class_hid = BNXT_ULP_CLASS_HID_4d2f7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 137,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1820] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d6db,
+	.class_hid = BNXT_ULP_CLASS_HID_4d933,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 138,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1821] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2220b,
+	.class_hid = BNXT_ULP_CLASS_HID_4ef63,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 139,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1822] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ad0b,
+	.class_hid = BNXT_ULP_CLASS_HID_4f5af,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 139,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1823] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3380b,
+	.class_hid = BNXT_ULP_CLASS_HID_4d98f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 139,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1824] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c30b,
+	.class_hid = BNXT_ULP_CLASS_HID_4dfcb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 139,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1825] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21ddf,
+	.class_hid = BNXT_ULP_CLASS_HID_1e6ab,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 139,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1826] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a8df,
+	.class_hid = BNXT_ULP_CLASS_HID_1ec97,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 139,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1827] = {
-	.class_hid = BNXT_ULP_CLASS_HID_333df,
+	.class_hid = BNXT_ULP_CLASS_HID_1d0f7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 140,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1828] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bedf,
+	.class_hid = BNXT_ULP_CLASS_HID_1d733,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 141,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1829] = {
-	.class_hid = BNXT_ULP_CLASS_HID_230ef,
+	.class_hid = BNXT_ULP_CLASS_HID_1ca3f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1830] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bbef,
+	.class_hid = BNXT_ULP_CLASS_HID_1d07b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1831] = {
-	.class_hid = BNXT_ULP_CLASS_HID_346ef,
+	.class_hid = BNXT_ULP_CLASS_HID_1f45b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1832] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d1ef,
+	.class_hid = BNXT_ULP_CLASS_HID_1fa87,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1833] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2594f,
+	.class_hid = BNXT_ULP_CLASS_HID_5e19f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1834] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28703,
+	.class_hid = BNXT_ULP_CLASS_HID_5e7db,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1835] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31203,
+	.class_hid = BNXT_ULP_CLASS_HID_5cc3b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1836] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39d03,
+	.class_hid = BNXT_ULP_CLASS_HID_5d267,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1837] = {
-	.class_hid = BNXT_ULP_CLASS_HID_245bf,
+	.class_hid = BNXT_ULP_CLASS_HID_5c563,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1838] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d0bf,
+	.class_hid = BNXT_ULP_CLASS_HID_5cbaf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1839] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35bbf,
+	.class_hid = BNXT_ULP_CLASS_HID_5ef8f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1840] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38a73,
+	.class_hid = BNXT_ULP_CLASS_HID_5f5cb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1841] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24173,
+	.class_hid = BNXT_ULP_CLASS_HID_adeb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1842] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cc73,
+	.class_hid = BNXT_ULP_CLASS_HID_b3d7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1843] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35773,
+	.class_hid = BNXT_ULP_CLASS_HID_f4c3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1844] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38507,
+	.class_hid = BNXT_ULP_CLASS_HID_fb0f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1845] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25403,
+	.class_hid = BNXT_ULP_CLASS_HID_b17f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1846] = {
-	.class_hid = BNXT_ULP_CLASS_HID_282d7,
+	.class_hid = BNXT_ULP_CLASS_HID_b7bb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1847] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30dd7,
+	.class_hid = BNXT_ULP_CLASS_HID_bb9b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1848] = {
-	.class_hid = BNXT_ULP_CLASS_HID_398d7,
+	.class_hid = BNXT_ULP_CLASS_HID_a1c7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1849] = {
-	.class_hid = BNXT_ULP_CLASS_HID_244a3,
+	.class_hid = BNXT_ULP_CLASS_HID_4a8df,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1850] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cfa3,
+	.class_hid = BNXT_ULP_CLASS_HID_4af1b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1851] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35aa3,
+	.class_hid = BNXT_ULP_CLASS_HID_4f037,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1852] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38977,
+	.class_hid = BNXT_ULP_CLASS_HID_4f673,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1853] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23193,
+	.class_hid = BNXT_ULP_CLASS_HID_4aca3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1854] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bc93,
+	.class_hid = BNXT_ULP_CLASS_HID_4b2ef,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1855] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34793,
+	.class_hid = BNXT_ULP_CLASS_HID_4b6cf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1856] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d293,
+	.class_hid = BNXT_ULP_CLASS_HID_4bd0b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1857] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22ca7,
+	.class_hid = BNXT_ULP_CLASS_HID_1a3eb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1858] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b7a7,
+	.class_hid = BNXT_ULP_CLASS_HID_1a9d7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1859] = {
-	.class_hid = BNXT_ULP_CLASS_HID_342a7,
+	.class_hid = BNXT_ULP_CLASS_HID_1ae37,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1860] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cda7,
+	.class_hid = BNXT_ULP_CLASS_HID_1b473,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1861] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24077,
+	.class_hid = BNXT_ULP_CLASS_HID_1e77f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1862] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cb77,
+	.class_hid = BNXT_ULP_CLASS_HID_1edbb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1863] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35677,
+	.class_hid = BNXT_ULP_CLASS_HID_1b19b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1864] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3840b,
+	.class_hid = BNXT_ULP_CLASS_HID_1b7c7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1865] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20beb,
+	.class_hid = BNXT_ULP_CLASS_HID_5bedf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1866] = {
-	.class_hid = BNXT_ULP_CLASS_HID_296eb,
+	.class_hid = BNXT_ULP_CLASS_HID_5a51b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1867] = {
-	.class_hid = BNXT_ULP_CLASS_HID_321eb,
+	.class_hid = BNXT_ULP_CLASS_HID_5a97b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1868] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3aceb,
+	.class_hid = BNXT_ULP_CLASS_HID_5afa7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1869] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25507,
+	.class_hid = BNXT_ULP_CLASS_HID_5e2a3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1870] = {
-	.class_hid = BNXT_ULP_CLASS_HID_283db,
+	.class_hid = BNXT_ULP_CLASS_HID_5e8ef,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1871] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30edb,
+	.class_hid = BNXT_ULP_CLASS_HID_5accf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1872] = {
-	.class_hid = BNXT_ULP_CLASS_HID_399db,
+	.class_hid = BNXT_ULP_CLASS_HID_5b30b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1873] = {
-	.class_hid = BNXT_ULP_CLASS_HID_250db,
+	.class_hid = BNXT_ULP_CLASS_HID_f36b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1874] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dbdb,
+	.class_hid = BNXT_ULP_CLASS_HID_f957,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1875] = {
-	.class_hid = BNXT_ULP_CLASS_HID_309ef,
+	.class_hid = BNXT_ULP_CLASS_HID_fa43,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1876] = {
-	.class_hid = BNXT_ULP_CLASS_HID_394ef,
+	.class_hid = BNXT_ULP_CLASS_HID_e3f3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1877] = {
-	.class_hid = BNXT_ULP_CLASS_HID_206bf,
+	.class_hid = BNXT_ULP_CLASS_HID_f6ff,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1878] = {
-	.class_hid = BNXT_ULP_CLASS_HID_291bf,
+	.class_hid = BNXT_ULP_CLASS_HID_fd3b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1879] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31cbf,
+	.class_hid = BNXT_ULP_CLASS_HID_e11b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1880] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a7bf,
+	.class_hid = BNXT_ULP_CLASS_HID_e747,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1881] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22f1f,
+	.class_hid = BNXT_ULP_CLASS_HID_4ee5f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1882] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ba1f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f49b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1883] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3451f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f5b7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1884] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d01f,
+	.class_hid = BNXT_ULP_CLASS_HID_4fbf3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1885] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21c4f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f223,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1886] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a74f,
+	.class_hid = BNXT_ULP_CLASS_HID_4f86f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1887] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3324f,
+	.class_hid = BNXT_ULP_CLASS_HID_4fc4f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1888] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bd4f,
+	.class_hid = BNXT_ULP_CLASS_HID_4e28b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1889] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21703,
+	.class_hid = BNXT_ULP_CLASS_HID_1e96b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1890] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a203,
+	.class_hid = BNXT_ULP_CLASS_HID_1ef57,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1891] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32d03,
+	.class_hid = BNXT_ULP_CLASS_HID_1f3b7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1892] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b803,
+	.class_hid = BNXT_ULP_CLASS_HID_1f9f3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1893] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22ad3,
+	.class_hid = BNXT_ULP_CLASS_HID_1ecff,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1894] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b5d3,
+	.class_hid = BNXT_ULP_CLASS_HID_1f33b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1895] = {
-	.class_hid = BNXT_ULP_CLASS_HID_340d3,
+	.class_hid = BNXT_ULP_CLASS_HID_1f71b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1896] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cbd3,
+	.class_hid = BNXT_ULP_CLASS_HID_1fd47,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1897] = {
-	.class_hid = BNXT_ULP_CLASS_HID_252b3,
+	.class_hid = BNXT_ULP_CLASS_HID_5e45f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1898] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28147,
+	.class_hid = BNXT_ULP_CLASS_HID_5ea9b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1899] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30c47,
+	.class_hid = BNXT_ULP_CLASS_HID_5eefb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1900] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39747,
+	.class_hid = BNXT_ULP_CLASS_HID_5f527,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1901] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23fe3,
+	.class_hid = BNXT_ULP_CLASS_HID_5e823,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1902] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cae3,
+	.class_hid = BNXT_ULP_CLASS_HID_5ee6f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1903] = {
-	.class_hid = BNXT_ULP_CLASS_HID_355e3,
+	.class_hid = BNXT_ULP_CLASS_HID_5f24f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1904] = {
-	.class_hid = BNXT_ULP_CLASS_HID_383b7,
+	.class_hid = BNXT_ULP_CLASS_HID_5f88b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1905] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23ab7,
+	.class_hid = BNXT_ULP_CLASS_HID_22c53,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -41757,20 +42541,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1906] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c5b7,
+	.class_hid = BNXT_ULP_CLASS_HID_2326f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -41778,21 +42557,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1907] = {
-	.class_hid = BNXT_ULP_CLASS_HID_350b7,
+	.class_hid = BNXT_ULP_CLASS_HID_2160f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -41800,21 +42574,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1908] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dbb7,
+	.class_hid = BNXT_ULP_CLASS_HID_21ccb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -41822,22 +42591,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1909] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24e47,
+	.class_hid = BNXT_ULP_CLASS_HID_24fc7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -41845,19 +42609,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1910] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d947,
+	.class_hid = BNXT_ULP_CLASS_HID_25583,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -41865,20 +42626,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1911] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3071b,
+	.class_hid = BNXT_ULP_CLASS_HID_239a3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -41886,20 +42644,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1912] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3921b,
+	.class_hid = BNXT_ULP_CLASS_HID_2407f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -41907,20 +42662,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1913] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2326f,
+	.class_hid = BNXT_ULP_CLASS_HID_21883,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -41929,15 +42681,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1914] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bd6f,
+	.class_hid = BNXT_ULP_CLASS_HID_21f5f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -41946,16 +42698,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1915] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3486f,
+	.class_hid = BNXT_ULP_CLASS_HID_2037f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -41964,16 +42716,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1916] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d36f,
+	.class_hid = BNXT_ULP_CLASS_HID_2093b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -41982,17 +42734,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1917] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21f5f,
+	.class_hid = BNXT_ULP_CLASS_HID_23c37,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42001,16 +42753,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1918] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2aa5f,
+	.class_hid = BNXT_ULP_CLASS_HID_242f3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42019,17 +42771,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1919] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3355f,
+	.class_hid = BNXT_ULP_CLASS_HID_22693,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42038,17 +42790,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1920] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c05f,
+	.class_hid = BNXT_ULP_CLASS_HID_22caf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42057,18 +42809,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1921] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21a13,
+	.class_hid = BNXT_ULP_CLASS_HID_62767,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42077,17 +42829,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1922] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a513,
+	.class_hid = BNXT_ULP_CLASS_HID_62d23,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42096,18 +42846,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1923] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33013,
+	.class_hid = BNXT_ULP_CLASS_HID_611c3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42116,18 +42864,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1924] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bb13,
+	.class_hid = BNXT_ULP_CLASS_HID_6179f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42136,19 +42882,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1925] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22d23,
+	.class_hid = BNXT_ULP_CLASS_HID_64a9b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42157,16 +42901,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1926] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b823,
+	.class_hid = BNXT_ULP_CLASS_HID_65157,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42175,17 +42919,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1927] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34323,
+	.class_hid = BNXT_ULP_CLASS_HID_63577,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42194,17 +42938,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1928] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ce23,
+	.class_hid = BNXT_ULP_CLASS_HID_63b33,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42213,18 +42957,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1929] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25583,
+	.class_hid = BNXT_ULP_CLASS_HID_61457,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42233,16 +42977,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1930] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28457,
+	.class_hid = BNXT_ULP_CLASS_HID_61a13,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42251,17 +42995,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1931] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30f57,
+	.class_hid = BNXT_ULP_CLASS_HID_65b7f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42270,17 +43014,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1932] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39a57,
+	.class_hid = BNXT_ULP_CLASS_HID_604cf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42289,18 +43033,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1933] = {
-	.class_hid = BNXT_ULP_CLASS_HID_242f3,
+	.class_hid = BNXT_ULP_CLASS_HID_637cb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42309,17 +43053,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1934] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cdf3,
+	.class_hid = BNXT_ULP_CLASS_HID_63d87,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42328,18 +43072,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1935] = {
-	.class_hid = BNXT_ULP_CLASS_HID_358f3,
+	.class_hid = BNXT_ULP_CLASS_HID_621a7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42348,18 +43092,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1936] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38687,
+	.class_hid = BNXT_ULP_CLASS_HID_62863,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42368,19 +43112,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1937] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23d87,
+	.class_hid = BNXT_ULP_CLASS_HID_34253,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42389,18 +43133,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1938] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c887,
+	.class_hid = BNXT_ULP_CLASS_HID_3486f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42409,19 +43150,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1939] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35387,
+	.class_hid = BNXT_ULP_CLASS_HID_32c0f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42430,19 +43168,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1940] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3825b,
+	.class_hid = BNXT_ULP_CLASS_HID_332cb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42451,20 +43186,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1941] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25157,
+	.class_hid = BNXT_ULP_CLASS_HID_3089b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42473,17 +43205,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1942] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dc57,
+	.class_hid = BNXT_ULP_CLASS_HID_30f57,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42492,18 +43223,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1943] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30a6b,
+	.class_hid = BNXT_ULP_CLASS_HID_34fa3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42512,18 +43242,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1944] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3956b,
+	.class_hid = BNXT_ULP_CLASS_HID_3567f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42532,19 +43261,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1945] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c53,
+	.class_hid = BNXT_ULP_CLASS_HID_32e83,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42553,14 +43281,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1946] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b753,
+	.class_hid = BNXT_ULP_CLASS_HID_3355f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42569,15 +43299,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1947] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34253,
+	.class_hid = BNXT_ULP_CLASS_HID_3197f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42586,15 +43318,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1948] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cd53,
+	.class_hid = BNXT_ULP_CLASS_HID_31f3b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42603,16 +43337,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1949] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21883,
+	.class_hid = BNXT_ULP_CLASS_HID_35237,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42621,15 +43357,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1950] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a383,
+	.class_hid = BNXT_ULP_CLASS_HID_358f3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42638,16 +43376,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1951] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32e83,
+	.class_hid = BNXT_ULP_CLASS_HID_33c93,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42656,16 +43396,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1952] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b983,
+	.class_hid = BNXT_ULP_CLASS_HID_342af,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42674,17 +43416,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1953] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21457,
+	.class_hid = BNXT_ULP_CLASS_HID_73d67,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42693,16 +43437,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1954] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29f57,
+	.class_hid = BNXT_ULP_CLASS_HID_74323,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42711,17 +43455,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1955] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32a57,
+	.class_hid = BNXT_ULP_CLASS_HID_727c3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42730,17 +43474,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1956] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b557,
+	.class_hid = BNXT_ULP_CLASS_HID_72d9f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42749,18 +43493,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1957] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22767,
+	.class_hid = BNXT_ULP_CLASS_HID_703af,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42769,15 +43513,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1958] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b267,
+	.class_hid = BNXT_ULP_CLASS_HID_70a6b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42786,16 +43532,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1959] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33d67,
+	.class_hid = BNXT_ULP_CLASS_HID_74b77,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42804,16 +43552,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1960] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c867,
+	.class_hid = BNXT_ULP_CLASS_HID_75133,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42822,17 +43572,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1961] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24fc7,
+	.class_hid = BNXT_ULP_CLASS_HID_72a57,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42841,15 +43593,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1962] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dac7,
+	.class_hid = BNXT_ULP_CLASS_HID_73013,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42858,16 +43612,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1963] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3089b,
+	.class_hid = BNXT_ULP_CLASS_HID_71433,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42876,16 +43632,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1964] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3939b,
+	.class_hid = BNXT_ULP_CLASS_HID_71acf,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42894,17 +43652,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1965] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23c37,
+	.class_hid = BNXT_ULP_CLASS_HID_74dcb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42913,16 +43673,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1966] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c737,
+	.class_hid = BNXT_ULP_CLASS_HID_75387,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42931,17 +43693,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1967] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35237,
+	.class_hid = BNXT_ULP_CLASS_HID_737a7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42950,17 +43714,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1968] = {
-	.class_hid = BNXT_ULP_CLASS_HID_380cb,
+	.class_hid = BNXT_ULP_CLASS_HID_73e63,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42969,18 +43735,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1969] = {
-	.class_hid = BNXT_ULP_CLASS_HID_237cb,
+	.class_hid = BNXT_ULP_CLASS_HID_2b753,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -42989,17 +43757,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1970] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c2cb,
+	.class_hid = BNXT_ULP_CLASS_HID_2bd6f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -43008,18 +43774,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1971] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34dcb,
+	.class_hid = BNXT_ULP_CLASS_HID_2a10f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -43028,18 +43792,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1972] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d8cb,
+	.class_hid = BNXT_ULP_CLASS_HID_2a7cb,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -43048,19 +43810,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1973] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24a9b,
+	.class_hid = BNXT_ULP_CLASS_HID_2dac7,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -43069,16 +43829,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1974] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d59b,
+	.class_hid = BNXT_ULP_CLASS_HID_28457,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -43087,17 +43847,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1975] = {
-	.class_hid = BNXT_ULP_CLASS_HID_303af,
+	.class_hid = BNXT_ULP_CLASS_HID_2c4a3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -43106,17 +43866,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1976] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38eaf,
+	.class_hid = BNXT_ULP_CLASS_HID_2cb7f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -43125,19 +43885,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1977] = {
-	.class_hid = BNXT_ULP_CLASS_HID_253b,
+	.class_hid = BNXT_ULP_CLASS_HID_2a383,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43145,16 +43905,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1978] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bf7,
+	.class_hid = BNXT_ULP_CLASS_HID_2aa5f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43162,17 +43923,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1979] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1827,
+	.class_hid = BNXT_ULP_CLASS_HID_28e7f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43180,18 +43942,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1980] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4f6b,
+	.class_hid = BNXT_ULP_CLASS_HID_2943b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43199,18 +43961,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1981] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c5b,
+	.class_hid = BNXT_ULP_CLASS_HID_2c737,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43218,19 +43981,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1982] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1653,
+	.class_hid = BNXT_ULP_CLASS_HID_2cdf3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43238,18 +44000,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
-	},
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
 	[1983] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0283,
+	.class_hid = BNXT_ULP_CLASS_HID_2b193,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43257,19 +44020,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1984] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39c7,
+	.class_hid = BNXT_ULP_CLASS_HID_2b7af,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43277,19 +44040,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1985] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2637,
+	.class_hid = BNXT_ULP_CLASS_HID_6b267,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43297,20 +44061,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1986] = {
-	.class_hid = BNXT_ULP_CLASS_HID_126b,
+	.class_hid = BNXT_ULP_CLASS_HID_6b823,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43318,17 +44079,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1987] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48af,
+	.class_hid = BNXT_ULP_CLASS_HID_69cc3,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43336,17 +44098,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1988] = {
-	.class_hid = BNXT_ULP_CLASS_HID_359f,
+	.class_hid = BNXT_ULP_CLASS_HID_6a29f,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43354,18 +44117,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1989] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0f97,
+	.class_hid = BNXT_ULP_CLASS_HID_6d59b,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43373,17 +44137,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1990] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5933,
+	.class_hid = BNXT_ULP_CLASS_HID_6dc57,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43391,18 +44156,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1991] = {
-	.class_hid = BNXT_ULP_CLASS_HID_330b,
+	.class_hid = BNXT_ULP_CLASS_HID_6c077,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43410,18 +44176,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1992] = {
-	.class_hid = BNXT_ULP_CLASS_HID_207b,
+	.class_hid = BNXT_ULP_CLASS_HID_6c633,
 	.class_tid = 1,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -43429,10090 +44196,22259 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1993] = {
-	.class_hid = BNXT_ULP_CLASS_HID_374e,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 142,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_69f57,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1994] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11ee,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 143,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_6a513,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1995] = {
-	.class_hid = BNXT_ULP_CLASS_HID_423a,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 143,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_68933,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1996] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0cd6,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 144,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_68fcf,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1997] = {
-	.class_hid = BNXT_ULP_CLASS_HID_310a,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 144,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_6c2cb,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1998] = {
-	.class_hid = BNXT_ULP_CLASS_HID_469e,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 144,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_6c887,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[1999] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ce6,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 144,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_6aca7,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2000] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0692,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 144,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_6b363,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2001] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c7e,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 144,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_3cd53,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2002] = {
-	.class_hid = BNXT_ULP_CLASS_HID_55c2,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 145,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_3d36f,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2003] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b2a,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 145,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_3b70f,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2004] = {
-	.class_hid = BNXT_ULP_CLASS_HID_15c6,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 146,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_3bdcb,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2005] = {
-	.class_hid = BNXT_ULP_CLASS_HID_163a,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 146,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_3939b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2006] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2f8e,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 146,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_39a57,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2007] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2516,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 146,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_3daa3,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2008] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4b76,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 146,
-	.flow_pattern_id = 0,
+	.class_hid = BNXT_ULP_CLASS_HID_38433,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2009] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10e6,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 146,
+	.class_hid = BNXT_ULP_CLASS_HID_3b983,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2010] = {
-	.class_hid = BNXT_ULP_CLASS_HID_264a,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 147,
+	.class_hid = BNXT_ULP_CLASS_HID_3c05f,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2011] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3fd2,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 147,
+	.class_hid = BNXT_ULP_CLASS_HID_3a47f,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2012] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4532,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 148,
+	.class_hid = BNXT_ULP_CLASS_HID_3aa3b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2013] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4996,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 148,
+	.class_hid = BNXT_ULP_CLASS_HID_380cb,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2014] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2036,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 148,
+	.class_hid = BNXT_ULP_CLASS_HID_38687,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
 	[2015] = {
-	.class_hid = BNXT_ULP_CLASS_HID_399e,
-	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 148,
+	.class_hid = BNXT_ULP_CLASS_HID_3c793,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
-	},
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
 	[2016] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ffe,
+	.class_hid = BNXT_ULP_CLASS_HID_3cdaf,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2017] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c867,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2018] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7ce23,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2019] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b2c3,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2020] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b89f,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2021] = {
+	.class_hid = BNXT_ULP_CLASS_HID_78eaf,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2022] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7956b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2023] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d677,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2024] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7dc33,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2025] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b557,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2026] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7bb13,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2027] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79f33,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2028] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a5cf,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2029] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d8cb,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2030] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7825b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2031] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c2a7,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2032] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c963,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2033] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8b4b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2034] = {
+	.class_hid = BNXT_ULP_CLASS_HID_9177,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2035] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d263,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2036] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d82f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2037] = {
+	.class_hid = BNXT_ULP_CLASS_HID_aedf,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2038] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b49b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2039] = {
+	.class_hid = BNXT_ULP_CLASS_HID_98bb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2040] = {
+	.class_hid = BNXT_ULP_CLASS_HID_9f67,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2041] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4867f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2042] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48c3b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2043] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4cd17,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2044] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d3d3,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2045] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a983,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2046] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b04f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2047] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4946f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2048] = {
+	.class_hid = BNXT_ULP_CLASS_HID_49a2b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2049] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a14b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2050] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a777,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2051] = {
+	.class_hid = BNXT_ULP_CLASS_HID_18b17,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2052] = {
+	.class_hid = BNXT_ULP_CLASS_HID_191d3,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2053] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c4df,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2054] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ca9b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2055] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1aebb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2056] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b567,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2057] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59c7f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2058] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a23b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2059] = {
+	.class_hid = BNXT_ULP_CLASS_HID_586db,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2060] = {
+	.class_hid = BNXT_ULP_CLASS_HID_58c87,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2061] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bf83,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2062] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c64f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2063] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5aa6f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2064] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b02b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2065] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d0cb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2066] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d6f7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2067] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d7e3,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2068] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c153,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2069] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f45f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2070] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fa1b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2071] = {
+	.class_hid = BNXT_ULP_CLASS_HID_de3b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2072] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e4e7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2073] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4cbff,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2074] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d1bb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2075] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d297,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2076] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d953,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2077] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ef03,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2078] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f5cf,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2079] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d9ef,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2080] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4dfab,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2081] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e6cb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2082] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ecf7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2083] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d097,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2084] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d753,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2085] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ca5f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2086] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d01b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2087] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f43b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2088] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fae7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2089] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e1ff,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2090] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e7bb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2091] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5cc5b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2092] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d207,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2093] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c503,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2094] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5cbcf,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2095] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5efef,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2096] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f5ab,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2097] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ad8b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2098] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b3b7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2099] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f4a3,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2100] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fb6f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2101] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b11f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2102] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b7db,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2103] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bbfb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2104] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a1a7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2105] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a8bf,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2106] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4af7b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2107] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f057,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2108] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f613,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2109] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4acc3,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2110] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b28f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2111] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b6af,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2112] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4bd6b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2113] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a38b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2114] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a9b7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2115] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ae57,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2116] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b413,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2117] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e71f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2118] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1eddb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2119] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b1fb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2120] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b7a7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2121] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bebf,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2122] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a57b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2123] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a91b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2124] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5afc7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2125] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e2c3,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2126] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e88f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2127] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5acaf,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2128] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b36b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2129] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f30b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2130] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f937,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2131] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fa23,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2132] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e393,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2133] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f69f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2134] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fd5b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2135] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e17b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2136] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e727,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2137] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ee3f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2138] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f4fb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2139] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f5d7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2140] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fb93,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2141] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f243,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2142] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f80f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2143] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fc2f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2144] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e2eb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2145] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e90b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2146] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ef37,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2147] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f3d7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2148] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f993,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2149] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ec9f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2150] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f35b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2151] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f77b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2152] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fd27,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2153] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e43f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2154] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5eafb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2155] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ee9b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2156] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f547,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2157] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e843,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2158] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ee0f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2159] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f22f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2160] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f8eb,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2161] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2579,
+	.class_tid = 1,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2162] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bb5,
+	.class_tid = 1,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2163] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4591,
+	.class_tid = 1,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2164] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4bad,
+	.class_tid = 1,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2165] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2561,
+	.class_tid = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2166] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bad,
+	.class_tid = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2167] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bdd,
+	.class_tid = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2168] = {
+	.class_hid = BNXT_ULP_CLASS_HID_054d,
+	.class_tid = 1,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2169] = {
+	.class_hid = BNXT_ULP_CLASS_HID_257b,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2170] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bb7,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2171] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0fd7,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2172] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1613,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2173] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48ef,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2174] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f2b,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2175] = {
+	.class_hid = BNXT_ULP_CLASS_HID_334b,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2176] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3987,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2177] = {
+	.class_hid = BNXT_ULP_CLASS_HID_122b,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2178] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1867,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2179] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5973,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2180] = {
+	.class_hid = BNXT_ULP_CLASS_HID_02c3,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2181] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35df,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2182] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3c1b,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2183] = {
+	.class_hid = BNXT_ULP_CLASS_HID_203b,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2184] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2677,
+	.class_tid = 1,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2185] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2563,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2186] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2baf,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2187] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0fcf,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2188] = {
+	.class_hid = BNXT_ULP_CLASS_HID_160b,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2189] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48f7,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2190] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f33,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2191] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3353,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2192] = {
+	.class_hid = BNXT_ULP_CLASS_HID_399f,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2193] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42097,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2194] = {
+	.class_hid = BNXT_ULP_CLASS_HID_426d3,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2195] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40af3,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2196] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4113f,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2197] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4443b,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2198] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44a67,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2199] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42e87,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2200] = {
+	.class_hid = BNXT_ULP_CLASS_HID_434c3,
+	.class_tid = 1,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2201] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2559,
+	.class_tid = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2202] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b95,
+	.class_tid = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2203] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45b1,
+	.class_tid = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2204] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b8d,
+	.class_tid = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2205] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2541,
+	.class_tid = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2206] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b8d,
+	.class_tid = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2207] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bfd,
+	.class_tid = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2208] = {
+	.class_hid = BNXT_ULP_CLASS_HID_056d,
+	.class_tid = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2209] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2539,
+	.class_tid = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2210] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bf5,
+	.class_tid = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2211] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45d1,
+	.class_tid = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2212] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4bed,
+	.class_tid = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2213] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2521,
+	.class_tid = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2214] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bed,
+	.class_tid = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2215] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b9d,
+	.class_tid = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2216] = {
+	.class_hid = BNXT_ULP_CLASS_HID_050d,
+	.class_tid = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2217] = {
+	.class_hid = BNXT_ULP_CLASS_HID_255b,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2218] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b97,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2219] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0ff7,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2220] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1633,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2221] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48cf,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2222] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f0b,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2223] = {
+	.class_hid = BNXT_ULP_CLASS_HID_336b,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2224] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39a7,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2225] = {
+	.class_hid = BNXT_ULP_CLASS_HID_120b,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2226] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1847,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2227] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5953,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2228] = {
+	.class_hid = BNXT_ULP_CLASS_HID_02e3,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2229] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35ff,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2230] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3c3b,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2231] = {
+	.class_hid = BNXT_ULP_CLASS_HID_201b,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2232] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2657,
+	.class_tid = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2233] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2543,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2234] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b8f,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2235] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0fef,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2236] = {
+	.class_hid = BNXT_ULP_CLASS_HID_162b,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2237] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48d7,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2238] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f13,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2239] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3373,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2240] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39bf,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2241] = {
+	.class_hid = BNXT_ULP_CLASS_HID_420b7,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2242] = {
+	.class_hid = BNXT_ULP_CLASS_HID_426f3,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2243] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40ad3,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2244] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4111f,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2245] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4441b,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2246] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44a47,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2247] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42ea7,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2248] = {
+	.class_hid = BNXT_ULP_CLASS_HID_434e3,
+	.class_tid = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2249] = {
+	.class_hid = BNXT_ULP_CLASS_HID_253b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2250] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bf7,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2251] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0f97,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2252] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1653,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2253] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48af,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2254] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f6b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2255] = {
+	.class_hid = BNXT_ULP_CLASS_HID_330b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2256] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39c7,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2257] = {
+	.class_hid = BNXT_ULP_CLASS_HID_126b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2258] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1827,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2259] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5933,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2260] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0283,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2261] = {
+	.class_hid = BNXT_ULP_CLASS_HID_359f,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2262] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3c5b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2263] = {
+	.class_hid = BNXT_ULP_CLASS_HID_207b,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2264] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2637,
+	.class_tid = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2265] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2523,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2266] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bef,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2267] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0f8f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2268] = {
+	.class_hid = BNXT_ULP_CLASS_HID_164b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2269] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48b7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2270] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f73,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2271] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3313,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2272] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39df,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2273] = {
+	.class_hid = BNXT_ULP_CLASS_HID_420d7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2274] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42693,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2275] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40ab3,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2276] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4117f,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2277] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4447b,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2278] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44a27,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 8,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2279] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42ec7,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2280] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43483,
+	.class_tid = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 72,
+	.flow_pattern_id = 2,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF1_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2281] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4156d,
+	.class_tid = 1,
+	.hdr_sig_id = 12,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 3,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_T_VXLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_12_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_12_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2282] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41b29,
+	.class_tid = 1,
+	.hdr_sig_id = 12,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 3,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_T_VXLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_12_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_12_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_12_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2283] = {
+	.class_hid = BNXT_ULP_CLASS_HID_52b6d,
+	.class_tid = 1,
+	.hdr_sig_id = 12,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 3,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_T_VXLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_12_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_12_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_12_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2284] = {
+	.class_hid = BNXT_ULP_CLASS_HID_53129,
+	.class_tid = 1,
+	.hdr_sig_id = 12,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 3,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_T_VXLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.field_sig = { .bits =
+		BNXT_ULP_HF1_12_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF1_12_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF1_12_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF1_12_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2285] = {
+	.class_hid = BNXT_ULP_CLASS_HID_478a,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2286] = {
+	.class_hid = BNXT_ULP_CLASS_HID_03a6,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2287] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4dce,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2288] = {
+	.class_hid = BNXT_ULP_CLASS_HID_09ea,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2289] = {
+	.class_hid = BNXT_ULP_CLASS_HID_08fe,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2290] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23ce,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2291] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0e02,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2292] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2912,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2293] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3e2a,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2294] = {
+	.class_hid = BNXT_ULP_CLASS_HID_593a,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2295] = {
+	.class_hid = BNXT_ULP_CLASS_HID_246e,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2296] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f7e,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2297] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e52,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2298] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a6e,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2299] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4796,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2300] = {
+	.class_hid = BNXT_ULP_CLASS_HID_03b2,
+	.class_tid = 2,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2301] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4163a,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2302] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4310a,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16388,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2303] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41c7e,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2304] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4374e,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16388,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2305] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42f8e,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2306] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4469e,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16388,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2307] = {
+	.class_hid = BNXT_ULP_CLASS_HID_455c2,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2308] = {
+	.class_hid = BNXT_ULP_CLASS_HID_411ee,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16388,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2309] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44b76,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2310] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40692,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24580,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2311] = {
+	.class_hid = BNXT_ULP_CLASS_HID_415c6,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2312] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40cd6,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24580,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2313] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42516,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2314] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45ce6,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24580,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2315] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42b2a,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2316] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4423a,
+	.class_tid = 2,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24580,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2317] = {
+	.class_hid = BNXT_ULP_CLASS_HID_229d8,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2318] = {
+	.class_hid = BNXT_ULP_CLASS_HID_240c8,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32772,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2319] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22f14,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2320] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24604,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32772,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2321] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23374,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2322] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22a64,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32836,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2323] = {
+	.class_hid = BNXT_ULP_CLASS_HID_238b0,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2324] = {
+	.class_hid = BNXT_ULP_CLASS_HID_253a0,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32836,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2325] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24dac,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2326] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20990,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32772,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2327] = {
+	.class_hid = BNXT_ULP_CLASS_HID_214dc,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2328] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20fcc,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32772,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2329] = {
+	.class_hid = BNXT_ULP_CLASS_HID_257c8,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2330] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2132c,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32836,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2331] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25d04,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2332] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21968,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32836,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2333] = {
+	.class_hid = BNXT_ULP_CLASS_HID_234e8,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2334] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22f98,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32772,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2335] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23a24,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2336] = {
+	.class_hid = BNXT_ULP_CLASS_HID_255d4,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32772,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2337] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21e04,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2338] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23934,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32836,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2339] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20440,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2340] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23f70,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32836,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2341] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2597c,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2342] = {
+	.class_hid = BNXT_ULP_CLASS_HID_214a0,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32772,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2343] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25eb8,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2344] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21a9c,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32772,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2345] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22298,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2346] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25d88,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32836,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2347] = {
+	.class_hid = BNXT_ULP_CLASS_HID_228d4,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2348] = {
+	.class_hid = BNXT_ULP_CLASS_HID_243c4,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32836,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2349] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6220c,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2350] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65d3c,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2351] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62848,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2352] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64378,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2353] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60fa8,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2354] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62758,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49220,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2355] = {
+	.class_hid = BNXT_ULP_CLASS_HID_635e4,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2356] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62c94,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49220,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2357] = {
+	.class_hid = BNXT_ULP_CLASS_HID_646e0,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2358] = {
+	.class_hid = BNXT_ULP_CLASS_HID_602c4,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2359] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61110,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2360] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60800,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2361] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6503c,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2362] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64b2c,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49220,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2363] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65678,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2364] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6125c,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49220,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2365] = {
+	.class_hid = BNXT_ULP_CLASS_HID_631dc,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2366] = {
+	.class_hid = BNXT_ULP_CLASS_HID_628cc,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2367] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63718,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2368] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62e08,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2369] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61b78,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2370] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63268,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49220,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2371] = {
+	.class_hid = BNXT_ULP_CLASS_HID_600b4,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2372] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63ba4,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49220,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2373] = {
+	.class_hid = BNXT_ULP_CLASS_HID_655b0,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2374] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61194,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2375] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65bec,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2376] = {
+	.class_hid = BNXT_ULP_CLASS_HID_617d0,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2377] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63fcc,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2378] = {
+	.class_hid = BNXT_ULP_CLASS_HID_656fc,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49220,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2379] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62508,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2380] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65c38,
+	.class_tid = 2,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49220,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2381] = {
+	.class_hid = BNXT_ULP_CLASS_HID_86e0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2382] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a1f0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131076,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2383] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8c2c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2384] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a73c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131076,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2385] = {
+	.class_hid = BNXT_ULP_CLASS_HID_904c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2386] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8b5c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131140,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2387] = {
+	.class_hid = BNXT_ULP_CLASS_HID_9988,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2388] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b098,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131140,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2389] = {
+	.class_hid = BNXT_ULP_CLASS_HID_aa94,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2390] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c264,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131076,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2391] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d0d0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2392] = {
+	.class_hid = BNXT_ULP_CLASS_HID_cba0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131076,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2393] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b4f0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2394] = {
+	.class_hid = BNXT_ULP_CLASS_HID_afc0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131140,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2395] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ba3c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2396] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d50c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131140,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2397] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48334,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2398] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ba04,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131076,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2399] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48970,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2400] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a040,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131076,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2401] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c84c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2402] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48460,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131140,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2403] = {
+	.class_hid = BNXT_ULP_CLASS_HID_492dc,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2404] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48dac,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131140,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2405] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a7d8,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2406] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4dea8,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131076,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2407] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ade4,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2408] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c4f4,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131076,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2409] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b104,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2410] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a814,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131140,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2411] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b740,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2412] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ae50,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131140,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2413] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1bce0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2414] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d7f0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2415] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a22c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2416] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1dd3c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2417] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1864c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2418] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a15c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2419] = {
+	.class_hid = BNXT_ULP_CLASS_HID_18f88,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2420] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a698,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2421] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c094,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2422] = {
+	.class_hid = BNXT_ULP_CLASS_HID_19ca8,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2423] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c6d0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2424] = {
+	.class_hid = BNXT_ULP_CLASS_HID_182f4,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2425] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1aaf0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2426] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c5c0,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2427] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d03c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2428] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1cb0c,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2429] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b934,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2430] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d004,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2431] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bf70,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2432] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d640,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2433] = {
+	.class_hid = BNXT_ULP_CLASS_HID_58290,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2434] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ba60,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2435] = {
+	.class_hid = BNXT_ULP_CLASS_HID_588dc,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2436] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a3ac,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2437] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ddd8,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2438] = {
+	.class_hid = BNXT_ULP_CLASS_HID_599fc,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2439] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c3e4,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2440] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59f38,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2441] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a704,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2442] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5de14,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2443] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ad40,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2444] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c450,
+	.class_tid = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2445] = {
+	.class_hid = BNXT_ULP_CLASS_HID_47aa,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2446] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0386,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2447] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4dee,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2448] = {
+	.class_hid = BNXT_ULP_CLASS_HID_09ca,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2449] = {
+	.class_hid = BNXT_ULP_CLASS_HID_08de,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2450] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23ee,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2451] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0e22,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2452] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2932,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2453] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3e0a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2454] = {
+	.class_hid = BNXT_ULP_CLASS_HID_591a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2455] = {
+	.class_hid = BNXT_ULP_CLASS_HID_244e,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2456] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f5e,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2457] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e72,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2458] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a4e,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2459] = {
+	.class_hid = BNXT_ULP_CLASS_HID_47b6,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2460] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0392,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2461] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5dc2,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2462] = {
+	.class_hid = BNXT_ULP_CLASS_HID_191e,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12292,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2463] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4306,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2464] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f62,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12292,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2465] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e76,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2466] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3906,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12292,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2467] = {
+	.class_hid = BNXT_ULP_CLASS_HID_07ba,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2468] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3f4a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12292,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2469] = {
+	.class_hid = BNXT_ULP_CLASS_HID_37a2,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2470] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2eb2,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14340,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2471] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3de6,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2472] = {
+	.class_hid = BNXT_ULP_CLASS_HID_54f6,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14340,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2473] = {
+	.class_hid = BNXT_ULP_CLASS_HID_578a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2474] = {
+	.class_hid = BNXT_ULP_CLASS_HID_13e6,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14340,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2475] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5dce,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2476] = {
+	.class_hid = BNXT_ULP_CLASS_HID_192a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14340,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2477] = {
+	.class_hid = BNXT_ULP_CLASS_HID_440f6,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2478] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41cd2,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20484,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2479] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4463a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2480] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40216,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20484,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2481] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4052a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2482] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43c3a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20484,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2483] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40b6e,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2484] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4227e,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20484,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2485] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43b56,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2486] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45266,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22532,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2487] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4209a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2488] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45baa,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22532,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2489] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45abe,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2490] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4169a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22532,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2491] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44082,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2492] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41cde,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22532,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2493] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4560e,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2494] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4126a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2495] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45c52,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2496] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41bae,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2497] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41b42,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2498] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43252,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2499] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40086,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2500] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43b96,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28676,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2501] = {
+	.class_hid = BNXT_ULP_CLASS_HID_430ee,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2502] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42bfe,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30724,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2503] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43632,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2504] = {
+	.class_hid = BNXT_ULP_CLASS_HID_451c2,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30724,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2505] = {
+	.class_hid = BNXT_ULP_CLASS_HID_450d6,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2506] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44be6,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30724,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2507] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4561a,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2508] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41276,
+	.class_tid = 2,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30724,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2509] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4161a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2510] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4312a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16388,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2511] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41c5e,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2512] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4376e,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16388,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2513] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42fae,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2514] = {
+	.class_hid = BNXT_ULP_CLASS_HID_446be,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16388,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2515] = {
+	.class_hid = BNXT_ULP_CLASS_HID_455e2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2516] = {
+	.class_hid = BNXT_ULP_CLASS_HID_411ce,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16388,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2517] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44b56,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2518] = {
+	.class_hid = BNXT_ULP_CLASS_HID_406b2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24580,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2519] = {
+	.class_hid = BNXT_ULP_CLASS_HID_415e6,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2520] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40cf6,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24580,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2521] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42536,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2522] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45cc6,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24580,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2523] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42b0a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2524] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4421a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24580,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2525] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6221a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2526] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65d2a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2527] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6285e,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2528] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6436e,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2529] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61cfa,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2530] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6378a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2531] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6023e,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2532] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63dce,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49156,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2533] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63ba2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2534] = {
+	.class_hid = BNXT_ULP_CLASS_HID_652b2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57348,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2535] = {
+	.class_hid = BNXT_ULP_CLASS_HID_621e6,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2536] = {
+	.class_hid = BNXT_ULP_CLASS_HID_658f6,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57348,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2537] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61202,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2538] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60d12,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57348,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2539] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61846,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2540] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63356,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57348,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2541] = {
+	.class_hid = BNXT_ULP_CLASS_HID_50c1a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2542] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5272a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81924,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2543] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5325e,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2544] = {
+	.class_hid = BNXT_ULP_CLASS_HID_52d6e,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81924,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2545] = {
+	.class_hid = BNXT_ULP_CLASS_HID_545ae,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2546] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5018a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81924,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2547] = {
+	.class_hid = BNXT_ULP_CLASS_HID_54be2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2548] = {
+	.class_hid = BNXT_ULP_CLASS_HID_507ce,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81924,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2549] = {
+	.class_hid = BNXT_ULP_CLASS_HID_505a2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2550] = {
+	.class_hid = BNXT_ULP_CLASS_HID_53cb2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90116,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2551] = {
+	.class_hid = BNXT_ULP_CLASS_HID_50be6,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2552] = {
+	.class_hid = BNXT_ULP_CLASS_HID_522f6,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90116,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2553] = {
+	.class_hid = BNXT_ULP_CLASS_HID_55b36,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2554] = {
+	.class_hid = BNXT_ULP_CLASS_HID_51712,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90116,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2555] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5410a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2556] = {
+	.class_hid = BNXT_ULP_CLASS_HID_51d56,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90116,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2557] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7581a,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2558] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71466,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2559] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75e5e,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2560] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71dba,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2561] = {
+	.class_hid = BNXT_ULP_CLASS_HID_732fa,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2562] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72d8a,
 	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 148,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2017] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34fe,
+	[2563] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7383e,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2564] = {
+	.class_hid = BNXT_ULP_CLASS_HID_753ce,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2565] = {
+	.class_hid = BNXT_ULP_CLASS_HID_751a2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2566] = {
+	.class_hid = BNXT_ULP_CLASS_HID_748b2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122884,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2567] = {
+	.class_hid = BNXT_ULP_CLASS_HID_757e6,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2568] = {
+	.class_hid = BNXT_ULP_CLASS_HID_713c2,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122884,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2569] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70802,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2570] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72312,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122884,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2571] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70e46,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2572] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72956,
+	.class_tid = 2,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122884,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2573] = {
+	.class_hid = BNXT_ULP_CLASS_HID_47ca,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2574] = {
+	.class_hid = BNXT_ULP_CLASS_HID_03e6,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2575] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d8e,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2576] = {
+	.class_hid = BNXT_ULP_CLASS_HID_09aa,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2577] = {
+	.class_hid = BNXT_ULP_CLASS_HID_08be,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2578] = {
+	.class_hid = BNXT_ULP_CLASS_HID_238e,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2579] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0e42,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2580] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2952,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4100,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2581] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3e6a,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2582] = {
+	.class_hid = BNXT_ULP_CLASS_HID_597a,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2583] = {
+	.class_hid = BNXT_ULP_CLASS_HID_242e,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2584] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f3e,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2585] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e12,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2586] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a2e,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2587] = {
+	.class_hid = BNXT_ULP_CLASS_HID_47d6,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2588] = {
+	.class_hid = BNXT_ULP_CLASS_HID_03f2,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6148,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2589] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5da2,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2590] = {
+	.class_hid = BNXT_ULP_CLASS_HID_197e,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12292,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2591] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4366,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2592] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f02,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12292,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2593] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e16,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2594] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3966,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12292,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2595] = {
+	.class_hid = BNXT_ULP_CLASS_HID_07da,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2596] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3f2a,
+	.class_tid = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12292,
+	.flow_pattern_id = 0,
+	.hdr_sig = { .bits =
+		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+	},
+	[2597] = {
+	.class_hid = BNXT_ULP_CLASS_HID_37c2,
 	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 148,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2018] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a32,
+	[2598] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2ed2,
 	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 149,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14340,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2019] = {
-	.class_hid = BNXT_ULP_CLASS_HID_14d2,
+	[2599] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d86,
 	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 149,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2020] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a42,
+	[2600] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5496,
 	.class_tid = 2,
-	.hdr_sig_id = 0,
-	.flow_sig_id = 149,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14340,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2021] = {
-	.class_hid = BNXT_ULP_CLASS_HID_376e,
+	[2601] = {
+	.class_hid = BNXT_ULP_CLASS_HID_57ea,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 149,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2022] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12d6e,
+	[2602] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1386,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 149,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14340,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2023] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2436e,
+	[2603] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5dae,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 150,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2024] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31dba,
+	[2604] = {
+	.class_hid = BNXT_ULP_CLASS_HID_194a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 151,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14340,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2025] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11ce,
+	[2605] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44096,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 152,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2026] = {
-	.class_hid = BNXT_ULP_CLASS_HID_107ce,
+	[2606] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41cb2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 152,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20484,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2027] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23dce,
+	[2607] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4465a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 152,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2028] = {
-	.class_hid = BNXT_ULP_CLASS_HID_353ce,
+	[2608] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40276,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 152,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20484,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2029] = {
-	.class_hid = BNXT_ULP_CLASS_HID_421a,
+	[2609] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4054a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 152,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2030] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11d56,
+	[2610] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43c5a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 152,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20484,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2031] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23356,
+	[2611] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40b0e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 153,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2032] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32956,
+	[2612] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4221e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 154,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20484,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2033] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0cf6,
+	[2613] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43b36,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2034] = {
-	.class_hid = BNXT_ULP_CLASS_HID_122f6,
+	[2614] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45206,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22532,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2035] = {
-	.class_hid = BNXT_ULP_CLASS_HID_258f6,
+	[2615] = {
+	.class_hid = BNXT_ULP_CLASS_HID_420fa,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2036] = {
-	.class_hid = BNXT_ULP_CLASS_HID_313c2,
+	[2616] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45bca,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22532,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2037] = {
-	.class_hid = BNXT_ULP_CLASS_HID_312a,
+	[2617] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45ade,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2038] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1272a,
+	[2618] = {
+	.class_hid = BNXT_ULP_CLASS_HID_416fa,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22532,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2039] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25d2a,
+	[2619] = {
+	.class_hid = BNXT_ULP_CLASS_HID_440e2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2040] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31466,
+	[2620] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41cbe,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22532,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2041] = {
-	.class_hid = BNXT_ULP_CLASS_HID_46be,
+	[2621] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4566e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2042] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1018a,
+	[2622] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4120a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2043] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2378a,
+	[2623] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45c32,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2044] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32d8a,
+	[2624] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41bce,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2045] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5cc6,
+	[2625] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41b22,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2046] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11712,
+	[2626] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43232,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2047] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20d12,
+	[2627] = {
+	.class_hid = BNXT_ULP_CLASS_HID_400e6,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2048] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32312,
+	[2628] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43bf6,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2049] = {
-	.class_hid = BNXT_ULP_CLASS_HID_06b2,
+	[2629] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4308e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2050] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13cb2,
+	[2630] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42b9e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30724,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2051] = {
-	.class_hid = BNXT_ULP_CLASS_HID_252b2,
+	[2631] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43652,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2052] = {
-	.class_hid = BNXT_ULP_CLASS_HID_348b2,
+	[2632] = {
+	.class_hid = BNXT_ULP_CLASS_HID_451a2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30724,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2053] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c5e,
+	[2633] = {
+	.class_hid = BNXT_ULP_CLASS_HID_450b6,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2054] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1325e,
+	[2634] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44b86,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 155,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30724,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2055] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2285e,
+	[2635] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4567a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 156,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2056] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35e5e,
+	[2636] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41216,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 157,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30724,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2057] = {
-	.class_hid = BNXT_ULP_CLASS_HID_55e2,
+	[2637] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4167a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 158,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2058] = {
-	.class_hid = BNXT_ULP_CLASS_HID_14be2,
+	[2638] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4314a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 158,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16388,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2059] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2023e,
+	[2639] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41c3e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 158,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2060] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3383e,
+	[2640] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4370e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 158,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16388,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2061] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b0a,
+	[2641] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42fce,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 158,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2062] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1410a,
+	[2642] = {
+	.class_hid = BNXT_ULP_CLASS_HID_446de,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 158,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16388,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2063] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21846,
+	[2643] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45582,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 159,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2064] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30e46,
+	[2644] = {
+	.class_hid = BNXT_ULP_CLASS_HID_411ae,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 160,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16388,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2065] = {
-	.class_hid = BNXT_ULP_CLASS_HID_15e6,
+	[2645] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44b36,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2066] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10be6,
+	[2646] = {
+	.class_hid = BNXT_ULP_CLASS_HID_406d2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24580,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2067] = {
-	.class_hid = BNXT_ULP_CLASS_HID_221e6,
+	[2647] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41586,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2068] = {
-	.class_hid = BNXT_ULP_CLASS_HID_357e6,
+	[2648] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40c96,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24580,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2069] = {
-	.class_hid = BNXT_ULP_CLASS_HID_161a,
+	[2649] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42556,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2070] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10c1a,
+	[2650] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45ca6,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24580,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2071] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2221a,
+	[2651] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42b6a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2072] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3581a,
+	[2652] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4427a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24580,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2073] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2fae,
+	[2653] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6227a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2074] = {
-	.class_hid = BNXT_ULP_CLASS_HID_145ae,
+	[2654] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65d4a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2075] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21cfa,
+	[2655] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6283e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2076] = {
-	.class_hid = BNXT_ULP_CLASS_HID_332fa,
+	[2656] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6430e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2077] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2536,
+	[2657] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61c9a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2078] = {
-	.class_hid = BNXT_ULP_CLASS_HID_15b36,
+	[2658] = {
+	.class_hid = BNXT_ULP_CLASS_HID_637ea,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2079] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21202,
+	[2659] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6025e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2080] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30802,
+	[2660] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63dae,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2081] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4b56,
+	[2661] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63bc2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2082] = {
-	.class_hid = BNXT_ULP_CLASS_HID_105a2,
+	[2662] = {
+	.class_hid = BNXT_ULP_CLASS_HID_652d2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57348,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2083] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23ba2,
+	[2663] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62186,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2084] = {
-	.class_hid = BNXT_ULP_CLASS_HID_351a2,
+	[2664] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65896,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57348,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2085] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10c6,
+	[2665] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61262,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2086] = {
-	.class_hid = BNXT_ULP_CLASS_HID_106c6,
+	[2666] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60d72,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 161,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57348,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2087] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23cc6,
+	[2667] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61826,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 162,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2088] = {
-	.class_hid = BNXT_ULP_CLASS_HID_352c6,
+	[2668] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63336,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 163,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57348,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2089] = {
-	.class_hid = BNXT_ULP_CLASS_HID_266a,
+	[2669] = {
+	.class_hid = BNXT_ULP_CLASS_HID_50c7a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 164,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2090] = {
-	.class_hid = BNXT_ULP_CLASS_HID_15c6a,
+	[2670] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5274a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 164,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81924,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2091] = {
-	.class_hid = BNXT_ULP_CLASS_HID_216a6,
+	[2671] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5323e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 164,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2092] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30ca6,
+	[2672] = {
+	.class_hid = BNXT_ULP_CLASS_HID_52d0e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 164,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81924,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2093] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ff2,
+	[2673] = {
+	.class_hid = BNXT_ULP_CLASS_HID_545ce,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 164,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2094] = {
-	.class_hid = BNXT_ULP_CLASS_HID_155f2,
+	[2674] = {
+	.class_hid = BNXT_ULP_CLASS_HID_501ea,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 164,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81924,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2095] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24bf2,
+	[2675] = {
+	.class_hid = BNXT_ULP_CLASS_HID_54b82,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 165,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2096] = {
-	.class_hid = BNXT_ULP_CLASS_HID_302ce,
+	[2676] = {
+	.class_hid = BNXT_ULP_CLASS_HID_507ae,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 166,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81924,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2097] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4512,
+	[2677] = {
+	.class_hid = BNXT_ULP_CLASS_HID_505c2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2098] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11c6e,
+	[2678] = {
+	.class_hid = BNXT_ULP_CLASS_HID_53cd2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90116,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2099] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2326e,
+	[2679] = {
+	.class_hid = BNXT_ULP_CLASS_HID_50b86,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2100] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3286e,
+	[2680] = {
+	.class_hid = BNXT_ULP_CLASS_HID_52296,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90116,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2101] = {
-	.class_hid = BNXT_ULP_CLASS_HID_49b6,
+	[2681] = {
+	.class_hid = BNXT_ULP_CLASS_HID_55b56,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2102] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10082,
+	[2682] = {
+	.class_hid = BNXT_ULP_CLASS_HID_51772,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90116,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2103] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23682,
+	[2683] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5416a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2104] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32c82,
+	[2684] = {
+	.class_hid = BNXT_ULP_CLASS_HID_51d36,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90116,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2105] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2016,
+	[2685] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7587a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2106] = {
-	.class_hid = BNXT_ULP_CLASS_HID_15616,
+	[2686] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71406,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2107] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21162,
+	[2687] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75e3e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2108] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30762,
+	[2688] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71dda,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2109] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39be,
+	[2689] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7329a,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2110] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12fbe,
+	[2690] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72dea,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2111] = {
-	.class_hid = BNXT_ULP_CLASS_HID_245be,
+	[2691] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7385e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2112] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31c8a,
+	[2692] = {
+	.class_hid = BNXT_ULP_CLASS_HID_753ae,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2113] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5fde,
+	[2693] = {
+	.class_hid = BNXT_ULP_CLASS_HID_751c2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2114] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1162a,
+	[2694] = {
+	.class_hid = BNXT_ULP_CLASS_HID_748d2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122884,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2115] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20c2a,
+	[2695] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75786,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2116] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3222a,
+	[2696] = {
+	.class_hid = BNXT_ULP_CLASS_HID_713a2,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122884,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2117] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34de,
+	[2697] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70862,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2118] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a12,
+	[2698] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72372,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122884,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2119] = {
-	.class_hid = BNXT_ULP_CLASS_HID_14f2,
+	[2699] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70e26,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2120] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a62,
+	[2700] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72936,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
-	.flow_sig_id = 167,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122884,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2121] = {
-	.class_hid = BNXT_ULP_CLASS_HID_370e,
+	[2701] = {
+	.class_hid = BNXT_ULP_CLASS_HID_229b8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 167,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2122] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12d0e,
+	[2702] = {
+	.class_hid = BNXT_ULP_CLASS_HID_240a8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 167,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2123] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2430e,
+	[2703] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22f74,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 168,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2124] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31dda,
+	[2704] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24664,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 169,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2125] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11ae,
+	[2705] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23314,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 170,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2126] = {
-	.class_hid = BNXT_ULP_CLASS_HID_107ae,
+	[2706] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22a04,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 170,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2127] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23dae,
+	[2707] = {
+	.class_hid = BNXT_ULP_CLASS_HID_238d0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 170,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2128] = {
-	.class_hid = BNXT_ULP_CLASS_HID_353ae,
+	[2708] = {
+	.class_hid = BNXT_ULP_CLASS_HID_253c0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 170,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2129] = {
-	.class_hid = BNXT_ULP_CLASS_HID_427a,
+	[2709] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24dcc,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 170,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2130] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11d36,
+	[2710] = {
+	.class_hid = BNXT_ULP_CLASS_HID_209f0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 170,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2131] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23336,
+	[2711] = {
+	.class_hid = BNXT_ULP_CLASS_HID_214bc,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 171,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2132] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32936,
+	[2712] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20fac,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 172,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2133] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0c96,
+	[2713] = {
+	.class_hid = BNXT_ULP_CLASS_HID_257a8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2134] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12296,
+	[2714] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2134c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2135] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25896,
+	[2715] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25d64,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2136] = {
-	.class_hid = BNXT_ULP_CLASS_HID_313a2,
+	[2716] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21908,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2137] = {
-	.class_hid = BNXT_ULP_CLASS_HID_314a,
+	[2717] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23488,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2138] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1274a,
+	[2718] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22ff8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2139] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25d4a,
+	[2719] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23a44,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2140] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31406,
+	[2720] = {
+	.class_hid = BNXT_ULP_CLASS_HID_255b4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2141] = {
-	.class_hid = BNXT_ULP_CLASS_HID_46de,
+	[2721] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21e64,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2142] = {
-	.class_hid = BNXT_ULP_CLASS_HID_101ea,
+	[2722] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23954,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2143] = {
-	.class_hid = BNXT_ULP_CLASS_HID_237ea,
+	[2723] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20420,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2144] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32dea,
+	[2724] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23f10,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2145] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ca6,
+	[2725] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2591c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2146] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11772,
+	[2726] = {
+	.class_hid = BNXT_ULP_CLASS_HID_214c0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2147] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20d72,
+	[2727] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25ed8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2148] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32372,
+	[2728] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21afc,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2149] = {
-	.class_hid = BNXT_ULP_CLASS_HID_06d2,
+	[2729] = {
+	.class_hid = BNXT_ULP_CLASS_HID_222f8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2150] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13cd2,
+	[2730] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25de8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2151] = {
-	.class_hid = BNXT_ULP_CLASS_HID_252d2,
+	[2731] = {
+	.class_hid = BNXT_ULP_CLASS_HID_228b4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2152] = {
-	.class_hid = BNXT_ULP_CLASS_HID_348d2,
+	[2732] = {
+	.class_hid = BNXT_ULP_CLASS_HID_243a4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2153] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c3e,
+	[2733] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6226c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2154] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1323e,
+	[2734] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65d5c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 173,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2155] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2283e,
+	[2735] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62828,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 174,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2156] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35e3e,
+	[2736] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64318,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 175,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2157] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5582,
+	[2737] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60fc8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 176,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2158] = {
-	.class_hid = BNXT_ULP_CLASS_HID_14b82,
+	[2738] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62738,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 176,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2159] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2025e,
+	[2739] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63584,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 176,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2160] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3385e,
+	[2740] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62cf4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 176,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2161] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b6a,
+	[2741] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64680,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 176,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2162] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1416a,
+	[2742] = {
+	.class_hid = BNXT_ULP_CLASS_HID_602a4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 176,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2163] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21826,
+	[2743] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61170,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 177,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2164] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30e26,
+	[2744] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60860,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 178,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2165] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1586,
+	[2745] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6505c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2166] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10b86,
+	[2746] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64b4c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2167] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22186,
+	[2747] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65618,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2168] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35786,
+	[2748] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6123c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2169] = {
-	.class_hid = BNXT_ULP_CLASS_HID_167a,
+	[2749] = {
+	.class_hid = BNXT_ULP_CLASS_HID_631bc,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2170] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10c7a,
+	[2750] = {
+	.class_hid = BNXT_ULP_CLASS_HID_628ac,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2171] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2227a,
+	[2751] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63778,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2172] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3587a,
+	[2752] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62e68,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2173] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2fce,
+	[2753] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61b18,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2174] = {
-	.class_hid = BNXT_ULP_CLASS_HID_145ce,
+	[2754] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63208,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2175] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21c9a,
+	[2755] = {
+	.class_hid = BNXT_ULP_CLASS_HID_600d4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2176] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3329a,
+	[2756] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63bc4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2177] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2556,
+	[2757] = {
+	.class_hid = BNXT_ULP_CLASS_HID_655d0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2178] = {
-	.class_hid = BNXT_ULP_CLASS_HID_15b56,
+	[2758] = {
+	.class_hid = BNXT_ULP_CLASS_HID_611f4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2179] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21262,
+	[2759] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65b8c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2180] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30862,
+	[2760] = {
+	.class_hid = BNXT_ULP_CLASS_HID_617b0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2181] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4b36,
+	[2761] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63fac,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2182] = {
-	.class_hid = BNXT_ULP_CLASS_HID_105c2,
+	[2762] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6569c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2183] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23bc2,
+	[2763] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62568,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2184] = {
-	.class_hid = BNXT_ULP_CLASS_HID_351c2,
+	[2764] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65c58,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2185] = {
-	.class_hid = BNXT_ULP_CLASS_HID_10a6,
+	[2765] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35fb8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2186] = {
-	.class_hid = BNXT_ULP_CLASS_HID_106a6,
+	[2766] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31b5c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 179,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98308,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2187] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23ca6,
+	[2767] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34574,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 180,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2188] = {
-	.class_hid = BNXT_ULP_CLASS_HID_352a6,
+	[2768] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30118,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 181,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98308,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2189] = {
-	.class_hid = BNXT_ULP_CLASS_HID_260a,
+	[2769] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32914,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 182,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2190] = {
-	.class_hid = BNXT_ULP_CLASS_HID_15c0a,
+	[2770] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34004,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 182,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98372,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2191] = {
-	.class_hid = BNXT_ULP_CLASS_HID_216c6,
+	[2771] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32ed0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 182,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2192] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30cc6,
+	[2772] = {
+	.class_hid = BNXT_ULP_CLASS_HID_349c0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 182,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98372,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2193] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3f92,
+	[2773] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30480,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 182,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2194] = {
-	.class_hid = BNXT_ULP_CLASS_HID_15592,
+	[2774] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33ff0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 182,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98308,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2195] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24b92,
+	[2775] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30abc,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 183,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2196] = {
-	.class_hid = BNXT_ULP_CLASS_HID_302ae,
+	[2776] = {
+	.class_hid = BNXT_ULP_CLASS_HID_325ac,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 184,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98308,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2197] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4572,
+	[2777] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34da8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2198] = {
-	.class_hid = BNXT_ULP_CLASS_HID_11c0e,
+	[2778] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3094c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98372,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2199] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2320e,
+	[2779] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31418,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2200] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3280e,
+	[2780] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30f08,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98372,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2201] = {
-	.class_hid = BNXT_ULP_CLASS_HID_49d6,
+	[2781] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32a88,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2202] = {
-	.class_hid = BNXT_ULP_CLASS_HID_100e2,
+	[2782] = {
+	.class_hid = BNXT_ULP_CLASS_HID_345f8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98308,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2203] = {
-	.class_hid = BNXT_ULP_CLASS_HID_236e2,
+	[2783] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35044,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2204] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32ce2,
+	[2784] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34bb4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98308,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2205] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2076,
+	[2785] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33464,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2206] = {
-	.class_hid = BNXT_ULP_CLASS_HID_15676,
+	[2786] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32f54,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98372,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2207] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21102,
+	[2787] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33a20,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2208] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30702,
+	[2788] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35510,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98372,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2209] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39de,
+	[2789] = {
+	.class_hid = BNXT_ULP_CLASS_HID_313d0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2210] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12fde,
+	[2790] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30ac0,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98308,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2211] = {
-	.class_hid = BNXT_ULP_CLASS_HID_245de,
+	[2791] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3198c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2212] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31cea,
+	[2792] = {
+	.class_hid = BNXT_ULP_CLASS_HID_330fc,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98308,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2213] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5fbe,
+	[2793] = {
+	.class_hid = BNXT_ULP_CLASS_HID_358f8,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2214] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1164a,
+	[2794] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3149c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98372,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2215] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20c4a,
+	[2795] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35eb4,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2216] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3224a,
+	[2796] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31a58,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98372,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2217] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34be,
+	[2797] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7586c,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2218] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a72,
+	[2798] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71410,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2219] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1492,
+	[2799] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75e28,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2220] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a02,
+	[2800] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71dcc,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
-	.flow_sig_id = 185,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2221] = {
-	.class_hid = BNXT_ULP_CLASS_HID_09ea,
+	[2801] = {
+	.class_hid = BNXT_ULP_CLASS_HID_725c8,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 185,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2222] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2912,
+	[2802] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75d38,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 186,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2223] = {
-	.class_hid = BNXT_ULP_CLASS_HID_03b2,
+	[2803] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72b84,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 186,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2224] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5f7e,
+	[2804] = {
+	.class_hid = BNXT_ULP_CLASS_HID_742f4,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 187,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2225] = {
-	.class_hid = BNXT_ULP_CLASS_HID_03a6,
+	[2805] = {
+	.class_hid = BNXT_ULP_CLASS_HID_701b4,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 187,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2226] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23ce,
+	[2806] = {
+	.class_hid = BNXT_ULP_CLASS_HID_738a4,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 187,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2227] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a6e,
+	[2807] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70770,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 187,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2228] = {
-	.class_hid = BNXT_ULP_CLASS_HID_593a,
+	[2808] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73e60,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 187,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2229] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4dce,
+	[2809] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7465c,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 187,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2230] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0e02,
+	[2810] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70200,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 188,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2231] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4796,
+	[2811] = {
+	.class_hid = BNXT_ULP_CLASS_HID_710cc,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 188,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2232] = {
-	.class_hid = BNXT_ULP_CLASS_HID_246e,
+	[2812] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7083c,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 189,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2233] = {
-	.class_hid = BNXT_ULP_CLASS_HID_478a,
+	[2813] = {
+	.class_hid = BNXT_ULP_CLASS_HID_727bc,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 189,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2234] = {
-	.class_hid = BNXT_ULP_CLASS_HID_08fe,
+	[2814] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75eac,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 189,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2235] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5e52,
+	[2815] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72d78,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 189,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2236] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3e2a,
+	[2816] = {
+	.class_hid = BNXT_ULP_CLASS_HID_74468,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 189,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2237] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5e46,
+	[2817] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73118,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 189,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2238] = {
-	.class_hid = BNXT_ULP_CLASS_HID_02ba,
+	[2818] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72808,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 190,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114756,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2239] = {
-	.class_hid = BNXT_ULP_CLASS_HID_580e,
+	[2819] = {
+	.class_hid = BNXT_ULP_CLASS_HID_736d4,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 190,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2240] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38e6,
+	[2820] = {
+	.class_hid = BNXT_ULP_CLASS_HID_751c4,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 191,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114756,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2241] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5802,
+	[2821] = {
+	.class_hid = BNXT_ULP_CLASS_HID_74bd0,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 191,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2242] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d76,
+	[2822] = {
+	.class_hid = BNXT_ULP_CLASS_HID_707f4,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 191,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2243] = {
-	.class_hid = BNXT_ULP_CLASS_HID_52ca,
+	[2823] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71240,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 191,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2244] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32a2,
+	[2824] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70db0,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 191,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114692,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2245] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34f6,
+	[2825] = {
+	.class_hid = BNXT_ULP_CLASS_HID_755ac,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 191,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2246] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a3a,
+	[2826] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71150,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 191,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114756,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2247] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5a22,
+	[2827] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75b68,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 191,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2248] = {
-	.class_hid = BNXT_ULP_CLASS_HID_541e,
+	[2828] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7170c,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
-	.flow_sig_id = 191,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114756,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2249] = {
-	.class_hid = BNXT_ULP_CLASS_HID_09ca,
+	[2829] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d2b8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 191,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2250] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0216,
+	[2830] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2cda8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 191,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2251] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f62,
+	[2831] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d874,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 192,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2252] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bae,
+	[2832] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29418,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 193,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2253] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2932,
+	[2833] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bc14,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 194,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2254] = {
-	.class_hid = BNXT_ULP_CLASS_HID_227e,
+	[2834] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d704,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 194,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2255] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3f4a,
+	[2835] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a5d0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 194,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2256] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b96,
+	[2836] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2dcc0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 194,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2257] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0392,
+	[2837] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29b80,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 194,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2258] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cde,
+	[2838] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b2f0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 194,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2259] = {
-	.class_hid = BNXT_ULP_CLASS_HID_192a,
+	[2839] = {
+	.class_hid = BNXT_ULP_CLASS_HID_281bc,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 195,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2260] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1276,
+	[2840] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b8ac,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 196,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2261] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5f5e,
+	[2841] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2c0a8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2262] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5baa,
+	[2842] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29c4c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2263] = {
-	.class_hid = BNXT_ULP_CLASS_HID_54f6,
+	[2843] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2c664,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2264] = {
-	.class_hid = BNXT_ULP_CLASS_HID_51c2,
+	[2844] = {
+	.class_hid = BNXT_ULP_CLASS_HID_28208,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2265] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0386,
+	[2845] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a188,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2266] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cd2,
+	[2846] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d8f8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2267] = {
-	.class_hid = BNXT_ULP_CLASS_HID_191e,
+	[2847] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a744,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2268] = {
-	.class_hid = BNXT_ULP_CLASS_HID_126a,
+	[2848] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2deb4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2269] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23ee,
+	[2849] = {
+	.class_hid = BNXT_ULP_CLASS_HID_28b64,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2270] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c3a,
+	[2850] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a254,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2271] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3906,
+	[2851] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b120,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2272] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3252,
+	[2852] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a810,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2273] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a4e,
+	[2853] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2c21c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2274] = {
-	.class_hid = BNXT_ULP_CLASS_HID_169a,
+	[2854] = {
+	.class_hid = BNXT_ULP_CLASS_HID_281c0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2275] = {
-	.class_hid = BNXT_ULP_CLASS_HID_13e6,
+	[2855] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2cbd8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2276] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4be6,
+	[2856] = {
+	.class_hid = BNXT_ULP_CLASS_HID_287fc,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2277] = {
-	.class_hid = BNXT_ULP_CLASS_HID_591a,
+	[2857] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2aff8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2278] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5266,
+	[2858] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2c6e8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2279] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2eb2,
+	[2859] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d5b4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2280] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bfe,
+	[2860] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29158,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2281] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4dee,
+	[2861] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6af6c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2282] = {
-	.class_hid = BNXT_ULP_CLASS_HID_463a,
+	[2862] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c65c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 197,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2283] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4306,
+	[2863] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d528,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 198,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2284] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5c52,
+	[2864] = {
+	.class_hid = BNXT_ULP_CLASS_HID_690cc,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 199,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2285] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0e22,
+	[2865] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6b8c8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 200,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2286] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0b6e,
+	[2866] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d038,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 200,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2287] = {
-	.class_hid = BNXT_ULP_CLASS_HID_07ba,
+	[2867] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6be84,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 200,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2288] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0086,
+	[2868] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d9f4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 200,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2289] = {
-	.class_hid = BNXT_ULP_CLASS_HID_47b6,
+	[2869] = {
+	.class_hid = BNXT_ULP_CLASS_HID_694b4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 200,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2290] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4082,
+	[2870] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68fa4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 200,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2291] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5dce,
+	[2871] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69a70,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 201,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2292] = {
-	.class_hid = BNXT_ULP_CLASS_HID_561a,
+	[2872] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6b560,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 202,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2293] = {
-	.class_hid = BNXT_ULP_CLASS_HID_244e,
+	[2873] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6dd5c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2294] = {
-	.class_hid = BNXT_ULP_CLASS_HID_209a,
+	[2874] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69900,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2295] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3de6,
+	[2875] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c318,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2296] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3632,
+	[2876] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69f3c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2297] = {
-	.class_hid = BNXT_ULP_CLASS_HID_47aa,
+	[2877] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6babc,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2298] = {
-	.class_hid = BNXT_ULP_CLASS_HID_40f6,
+	[2878] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d5ac,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2299] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5dc2,
+	[2879] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a078,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2300] = {
-	.class_hid = BNXT_ULP_CLASS_HID_560e,
+	[2880] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6db68,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2301] = {
-	.class_hid = BNXT_ULP_CLASS_HID_08de,
+	[2881] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68418,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2302] = {
-	.class_hid = BNXT_ULP_CLASS_HID_052a,
+	[2882] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6bf08,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2303] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e76,
+	[2883] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68dd4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2304] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b42,
+	[2884] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a4c4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2305] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5e72,
+	[2885] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6ded0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2306] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5abe,
+	[2886] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69af4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2307] = {
-	.class_hid = BNXT_ULP_CLASS_HID_578a,
+	[2887] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c48c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2308] = {
-	.class_hid = BNXT_ULP_CLASS_HID_50d6,
+	[2888] = {
+	.class_hid = BNXT_ULP_CLASS_HID_680b0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2309] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3e0a,
+	[2889] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a8ac,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2310] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b56,
+	[2890] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c39c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2311] = {
-	.class_hid = BNXT_ULP_CLASS_HID_37a2,
+	[2891] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6ae68,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2312] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30ee,
+	[2892] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c958,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2313] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5e66,
+	[2893] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3c8b8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2314] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ab2,
+	[2894] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3845c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 203,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2315] = {
-	.class_hid = BNXT_ULP_CLASS_HID_57fe,
+	[2895] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39328,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 204,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2316] = {
-	.class_hid = BNXT_ULP_CLASS_HID_50ca,
+	[2896] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38a18,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 205,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2317] = {
-	.class_hid = BNXT_ULP_CLASS_HID_029a,
+	[2897] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d214,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 206,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2318] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fe6,
+	[2898] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3cd04,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 206,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2319] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1832,
+	[2899] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3dbd0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 206,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2320] = {
-	.class_hid = BNXT_ULP_CLASS_HID_157e,
+	[2900] = {
+	.class_hid = BNXT_ULP_CLASS_HID_397f4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 206,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2321] = {
-	.class_hid = BNXT_ULP_CLASS_HID_582e,
+	[2901] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b180,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 206,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2322] = {
-	.class_hid = BNXT_ULP_CLASS_HID_557a,
+	[2902] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a8f0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 206,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2323] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2e46,
+	[2903] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b7bc,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 207,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2324] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a92,
+	[2904] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3aeac,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 208,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2325] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38c6,
+	[2905] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39b5c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2326] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3512,
+	[2906] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b24c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2327] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0e5e,
+	[2907] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38118,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2328] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0aaa,
+	[2908] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b808,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2329] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5822,
+	[2909] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d788,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2330] = {
-	.class_hid = BNXT_ULP_CLASS_HID_556e,
+	[2910] = {
+	.class_hid = BNXT_ULP_CLASS_HID_393ac,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2331] = {
-	.class_hid = BNXT_ULP_CLASS_HID_51ba,
+	[2911] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3dd44,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2332] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a86,
+	[2912] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39968,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2333] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d56,
+	[2913] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a164,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2334] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19a2,
+	[2914] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d854,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2335] = {
-	.class_hid = BNXT_ULP_CLASS_HID_12ee,
+	[2915] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a720,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2336] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4aee,
+	[2916] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3de10,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2337] = {
-	.class_hid = BNXT_ULP_CLASS_HID_52ea,
+	[2917] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39cd0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2338] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2f36,
+	[2918] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b7c0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2339] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2802,
+	[2919] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3828c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2340] = {
-	.class_hid = BNXT_ULP_CLASS_HID_254e,
+	[2920] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3bdfc,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2341] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3282,
+	[2921] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3c5f8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2342] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0fce,
+	[2922] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3819c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2343] = {
-	.class_hid = BNXT_ULP_CLASS_HID_081a,
+	[2923] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3cbb4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2344] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0566,
+	[2924] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38758,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2345] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34d6,
+	[2925] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c56c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2346] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a1a,
+	[2926] = {
+	.class_hid = BNXT_ULP_CLASS_HID_78110,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245764,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2347] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5a02,
+	[2927] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7cb28,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2348] = {
-	.class_hid = BNXT_ULP_CLASS_HID_543e,
+	[2928] = {
+	.class_hid = BNXT_ULP_CLASS_HID_786cc,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
-	.flow_sig_id = 209,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245764,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2349] = {
-	.class_hid = BNXT_ULP_CLASS_HID_09aa,
+	[2929] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7aec8,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 209,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2350] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0276,
+	[2930] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c638,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 209,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2351] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f02,
+	[2931] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d484,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 210,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2352] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bce,
+	[2932] = {
+	.class_hid = BNXT_ULP_CLASS_HID_790a8,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 211,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2353] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2952,
+	[2933] = {
+	.class_hid = BNXT_ULP_CLASS_HID_78ab4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 212,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2354] = {
-	.class_hid = BNXT_ULP_CLASS_HID_221e,
+	[2934] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a5a4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 212,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245764,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2355] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3f2a,
+	[2935] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b070,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 212,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2356] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bf6,
+	[2936] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7ab60,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 212,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245764,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2357] = {
-	.class_hid = BNXT_ULP_CLASS_HID_03f2,
+	[2937] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79410,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 212,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2358] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cbe,
+	[2938] = {
+	.class_hid = BNXT_ULP_CLASS_HID_78f00,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 212,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2359] = {
-	.class_hid = BNXT_ULP_CLASS_HID_194a,
+	[2939] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79dcc,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 213,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2360] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1216,
+	[2940] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b53c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 214,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2361] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5f3e,
+	[2941] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d0bc,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2362] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5bca,
+	[2942] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7cbac,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245764,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2363] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5496,
+	[2943] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d678,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2364] = {
-	.class_hid = BNXT_ULP_CLASS_HID_51a2,
+	[2944] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7921c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245764,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2365] = {
-	.class_hid = BNXT_ULP_CLASS_HID_03e6,
+	[2945] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7ba18,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2366] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cb2,
+	[2946] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d508,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2367] = {
-	.class_hid = BNXT_ULP_CLASS_HID_197e,
+	[2947] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a3d4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2368] = {
-	.class_hid = BNXT_ULP_CLASS_HID_120a,
+	[2948] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7dac4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2369] = {
-	.class_hid = BNXT_ULP_CLASS_HID_238e,
+	[2949] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79984,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2370] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c5a,
+	[2950] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b0f4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245764,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2371] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3966,
+	[2951] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79f40,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2372] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3232,
+	[2952] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b6b0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245764,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2373] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a2e,
+	[2953] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7deac,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2374] = {
-	.class_hid = BNXT_ULP_CLASS_HID_16fa,
+	[2954] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79a50,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2375] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1386,
+	[2955] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c468,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2376] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4b86,
+	[2956] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7800c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2377] = {
-	.class_hid = BNXT_ULP_CLASS_HID_597a,
+	[2957] = {
+	.class_hid = BNXT_ULP_CLASS_HID_86c0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2378] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5206,
+	[2958] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a1d0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2379] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ed2,
+	[2959] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8c0c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2380] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b9e,
+	[2960] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a71c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2381] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4d8e,
+	[2961] = {
+	.class_hid = BNXT_ULP_CLASS_HID_906c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2382] = {
-	.class_hid = BNXT_ULP_CLASS_HID_465a,
+	[2962] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8b7c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 215,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2383] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4366,
+	[2963] = {
+	.class_hid = BNXT_ULP_CLASS_HID_99a8,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 216,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2384] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5c32,
+	[2964] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b0b8,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 217,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2385] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0e42,
+	[2965] = {
+	.class_hid = BNXT_ULP_CLASS_HID_aab4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 218,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2386] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0b0e,
+	[2966] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c244,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 218,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2387] = {
-	.class_hid = BNXT_ULP_CLASS_HID_07da,
+	[2967] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d0f0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 218,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2388] = {
-	.class_hid = BNXT_ULP_CLASS_HID_00e6,
+	[2968] = {
+	.class_hid = BNXT_ULP_CLASS_HID_cb80,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 218,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2389] = {
-	.class_hid = BNXT_ULP_CLASS_HID_47d6,
+	[2969] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b4d0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 218,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2390] = {
-	.class_hid = BNXT_ULP_CLASS_HID_40e2,
+	[2970] = {
+	.class_hid = BNXT_ULP_CLASS_HID_afe0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 218,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2391] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5dae,
+	[2971] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ba1c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 219,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2392] = {
-	.class_hid = BNXT_ULP_CLASS_HID_567a,
+	[2972] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d52c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 220,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2393] = {
-	.class_hid = BNXT_ULP_CLASS_HID_242e,
+	[2973] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48314,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2394] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20fa,
+	[2974] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ba24,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2395] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d86,
+	[2975] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48950,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2396] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3652,
+	[2976] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a060,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2397] = {
-	.class_hid = BNXT_ULP_CLASS_HID_47ca,
+	[2977] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c86c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2398] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4096,
+	[2978] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48440,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2399] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5da2,
+	[2979] = {
+	.class_hid = BNXT_ULP_CLASS_HID_492fc,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2400] = {
-	.class_hid = BNXT_ULP_CLASS_HID_566e,
+	[2980] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48d8c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2401] = {
-	.class_hid = BNXT_ULP_CLASS_HID_08be,
+	[2981] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a7f8,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2402] = {
-	.class_hid = BNXT_ULP_CLASS_HID_054a,
+	[2982] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4de88,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2403] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e16,
+	[2983] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4adc4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2404] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b22,
+	[2984] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c4d4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2405] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5e12,
+	[2985] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b124,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2406] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ade,
+	[2986] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a834,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2407] = {
-	.class_hid = BNXT_ULP_CLASS_HID_57ea,
+	[2987] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b760,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2408] = {
-	.class_hid = BNXT_ULP_CLASS_HID_50b6,
+	[2988] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ae70,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2409] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3e6a,
+	[2989] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1bcc0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2410] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b36,
+	[2990] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d7d0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2411] = {
-	.class_hid = BNXT_ULP_CLASS_HID_37c2,
+	[2991] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a20c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2412] = {
-	.class_hid = BNXT_ULP_CLASS_HID_308e,
+	[2992] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1dd1c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2413] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5e06,
+	[2993] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1866c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2414] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ad2,
+	[2994] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a17c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 221,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2415] = {
-	.class_hid = BNXT_ULP_CLASS_HID_579e,
+	[2995] = {
+	.class_hid = BNXT_ULP_CLASS_HID_18fa8,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 222,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2416] = {
-	.class_hid = BNXT_ULP_CLASS_HID_50aa,
+	[2996] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a6b8,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 223,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2417] = {
-	.class_hid = BNXT_ULP_CLASS_HID_02fa,
+	[2997] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c0b4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 224,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2418] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f86,
+	[2998] = {
+	.class_hid = BNXT_ULP_CLASS_HID_19c88,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 224,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2419] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1852,
+	[2999] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c6f0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 224,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2420] = {
-	.class_hid = BNXT_ULP_CLASS_HID_151e,
+	[3000] = {
+	.class_hid = BNXT_ULP_CLASS_HID_182d4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 224,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2421] = {
-	.class_hid = BNXT_ULP_CLASS_HID_584e,
+	[3001] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1aad0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 224,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2422] = {
-	.class_hid = BNXT_ULP_CLASS_HID_551a,
+	[3002] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c5e0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 224,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2423] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2e26,
+	[3003] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d01c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 225,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2424] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2af2,
+	[3004] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1cb2c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 226,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2425] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38a6,
+	[3005] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b914,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2426] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3572,
+	[3006] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d024,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2427] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0e3e,
+	[3007] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bf50,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2428] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0aca,
+	[3008] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d660,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2429] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5842,
+	[3009] = {
+	.class_hid = BNXT_ULP_CLASS_HID_582b0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2430] = {
-	.class_hid = BNXT_ULP_CLASS_HID_550e,
+	[3010] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ba40,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2431] = {
-	.class_hid = BNXT_ULP_CLASS_HID_51da,
+	[3011] = {
+	.class_hid = BNXT_ULP_CLASS_HID_588fc,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2432] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ae6,
+	[3012] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a38c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2433] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d36,
+	[3013] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ddf8,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2434] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19c2,
+	[3014] = {
+	.class_hid = BNXT_ULP_CLASS_HID_599dc,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2435] = {
-	.class_hid = BNXT_ULP_CLASS_HID_128e,
+	[3015] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c3c4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2436] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4a8e,
+	[3016] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59f18,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196612,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2437] = {
-	.class_hid = BNXT_ULP_CLASS_HID_528a,
+	[3017] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a724,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2438] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2f56,
+	[3018] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5de34,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2439] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2862,
+	[3019] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ad60,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2440] = {
-	.class_hid = BNXT_ULP_CLASS_HID_252e,
+	[3020] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c470,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196676,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2441] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32e2,
+	[3021] = {
+	.class_hid = BNXT_ULP_CLASS_HID_cd40,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2442] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0fae,
+	[3022] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e450,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393220,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2443] = {
-	.class_hid = BNXT_ULP_CLASS_HID_087a,
+	[3023] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f28c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2444] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0506,
+	[3024] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ed9c,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393220,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2445] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34b6,
+	[3025] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d6ec,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2446] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a7a,
+	[3026] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f1fc,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393284,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2447] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5a62,
+	[3027] = {
+	.class_hid = BNXT_ULP_CLASS_HID_dc28,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2448] = {
-	.class_hid = BNXT_ULP_CLASS_HID_545e,
+	[3028] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f738,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
-	.flow_sig_id = 227,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393284,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_OO_VLAN |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2449] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a73c,
+	[3029] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d134,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 227,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2450] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a040,
+	[3030] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c8c4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 227,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2451] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d640,
+	[3031] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d770,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 227,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2452] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dd3c,
+	[3032] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d354,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 227,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2453] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cba0,
+	[3033] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fb50,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 227,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2454] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c4f4,
+	[3034] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d260,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 227,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2455] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19f38,
+	[3035] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e09c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 227,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2456] = {
-	.class_hid = BNXT_ULP_CLASS_HID_182f4,
+	[3036] = {
+	.class_hid = BNXT_ULP_CLASS_HID_dbac,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 227,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2457] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b098,
+	[3037] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c994,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 227,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2458] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8dac,
+	[3038] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e0a4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 228,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2459] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a3ac,
+	[3039] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4cfd0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 228,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2460] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a698,
+	[3040] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e6e0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2461] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d50c,
+	[3041] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d330,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2462] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ae50,
+	[3042] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4cac0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2463] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c450,
+	[3043] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d97c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2464] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cb0c,
+	[3044] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f00c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2465] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a1f0,
+	[3045] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ea78,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2466] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ba04,
+	[3046] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c508,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2467] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d004,
+	[3047] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d044,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2468] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d7f0,
+	[3048] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4cb54,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2469] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c264,
+	[3049] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f7a4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2470] = {
-	.class_hid = BNXT_ULP_CLASS_HID_dea8,
+	[3050] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4eeb4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2471] = {
-	.class_hid = BNXT_ULP_CLASS_HID_199fc,
+	[3051] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fde0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2472] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19ca8,
+	[3052] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d4f0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2473] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8b5c,
+	[3053] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e340,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2474] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8460,
+	[3054] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1da50,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2475] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ba60,
+	[3055] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e88c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2476] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a15c,
+	[3056] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c39c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2477] = {
-	.class_hid = BNXT_ULP_CLASS_HID_afc0,
+	[3057] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ccec,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2478] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a814,
+	[3058] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e7fc,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2479] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1de14,
+	[3059] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f228,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2480] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c5c0,
+	[3060] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ed38,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2481] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8c2c,
+	[3061] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c734,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2482] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8970,
+	[3062] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c308,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2483] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bf70,
+	[3063] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1cd70,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2484] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a22c,
+	[3064] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c954,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2485] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d0d0,
+	[3065] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d150,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2486] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ade4,
+	[3066] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c860,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2487] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c3e4,
+	[3067] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d69c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2488] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c6d0,
+	[3068] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d2f0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2489] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9988,
+	[3069] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ff94,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 229,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2490] = {
-	.class_hid = BNXT_ULP_CLASS_HID_92dc,
+	[3070] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d6a4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 230,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2491] = {
-	.class_hid = BNXT_ULP_CLASS_HID_188dc,
+	[3071] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e5d0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 230,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2492] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18f88,
+	[3072] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5dce0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2493] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ba3c,
+	[3073] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c930,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2494] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b740,
+	[3074] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e0c0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2495] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ad40,
+	[3075] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5cf7c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2496] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d03c,
+	[3076] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e60c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2497] = {
-	.class_hid = BNXT_ULP_CLASS_HID_86e0,
+	[3077] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c078,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2498] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8334,
+	[3078] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5dc5c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2499] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b934,
+	[3079] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c644,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2500] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bce0,
+	[3080] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c598,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2501] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aa94,
+	[3081] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5eda4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2502] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a7d8,
+	[3082] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c4b4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2503] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ddd8,
+	[3083] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d3e0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2504] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c094,
+	[3084] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5caf0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2505] = {
-	.class_hid = BNXT_ULP_CLASS_HID_904c,
+	[3085] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ab80,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2506] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c84c,
+	[3086] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a290,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2507] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18290,
+	[3087] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b1cc,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2508] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1864c,
+	[3088] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a8dc,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2509] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b4f0,
+	[3089] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b52c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2510] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b104,
+	[3090] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ac3c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2511] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a704,
+	[3091] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bb68,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2512] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1aaf0,
+	[3092] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b278,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2513] = {
-	.class_hid = BNXT_ULP_CLASS_HID_80a4,
+	[3093] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ac74,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2514] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9de8,
+	[3094] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e704,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655364,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2515] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b3e8,
+	[3095] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f5b0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2516] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b6a4,
+	[3096] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b194,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655364,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2517] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a548,
+	[3097] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b990,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2518] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a19c,
+	[3098] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f0a0,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655428,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2519] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d79c,
+	[3099] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bfdc,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2520] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1db48,
+	[3100] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f6ec,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655428,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2521] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9a98,
+	[3101] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a4d4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2522] = {
-	.class_hid = BNXT_ULP_CLASS_HID_97ac,
+	[3102] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4bfe4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655364,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2523] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18dac,
+	[3103] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4aa10,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2524] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b098,
+	[3104] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a520,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655364,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2525] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bf0c,
+	[3105] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ed2c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2526] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b850,
+	[3106] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a900,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655428,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2527] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ae50,
+	[3107] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b7bc,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2528] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d50c,
+	[3108] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4af4c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655428,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2529] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34f0,
+	[3109] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a8b8,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2530] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a3c,
+	[3110] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e048,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655364,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2531] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3740,
+	[3111] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ae84,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2532] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ea0,
+	[3112] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e994,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655364,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2533] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5bf4,
+	[3113] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b2e4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2534] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0798,
+	[3114] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4adf4,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 231,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655428,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2535] = {
-	.class_hid = BNXT_ULP_CLASS_HID_00ac,
+	[3115] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b820,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2536] = {
-	.class_hid = BNXT_ULP_CLASS_HID_280c,
+	[3116] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f330,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655428,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2537] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2550,
+	[3117] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a180,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2538] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3104,
+	[3118] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f890,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720900,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2539] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5964,
+	[3119] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a7cc,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2540] = {
-	.class_hid = BNXT_ULP_CLASS_HID_55a8,
+	[3120] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fedc,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720900,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2541] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e5c,
+	[3121] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ab2c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2542] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b60,
+	[3122] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a23c,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720964,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2543] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c0,
+	[3123] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b168,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2544] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3f14,
+	[3124] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a878,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
-	.flow_sig_id = 232,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720964,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2545] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a71c,
+	[3125] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e274,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53521,17 +66457,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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2546] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a8dc,
+	[3126] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1be48,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53540,18 +66477,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2547] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ed9c,
+	[3127] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ebb0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53560,18 +66498,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2548] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ef5c,
+	[3128] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a794,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53580,19 +66519,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2549] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a060,
+	[3129] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1af90,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53601,18 +66541,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2550] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a520,
+	[3130] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e6a0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53621,19 +66562,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2551] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e6e0,
+	[3131] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f5dc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53642,19 +66584,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2552] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eba0,
+	[3132] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b130,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53663,20 +66606,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2553] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d660,
+	[3133] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bad4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53685,19 +66629,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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2554] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fb20,
+	[3134] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f5e4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53706,20 +66649,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2555] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dce0,
+	[3135] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a010,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53728,20 +66670,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2556] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e1a0,
+	[3136] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5fb20,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53750,21 +66691,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2557] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dd1c,
+	[3137] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a470,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53773,18 +66713,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2558] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fedc,
+	[3138] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bf00,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53793,19 +66734,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2559] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c39c,
+	[3139] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5adbc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53814,19 +66756,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2560] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e55c,
+	[3140] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a54c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53835,20 +66778,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2561] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cb80,
+	[3141] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5feb8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53857,18 +66801,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2562] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b194,
+	[3142] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ba9c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53877,19 +66822,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2563] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d354,
+	[3143] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e484,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53898,19 +66844,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2564] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f414,
+	[3144] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a0d8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53919,20 +66866,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2565] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c4d4,
+	[3145] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a8e4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53941,19 +66889,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2566] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e994,
+	[3146] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e3f4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53962,20 +66911,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2567] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cb54,
+	[3147] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ae20,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -53984,20 +66934,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2568] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f158,
+	[3148] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e930,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54006,21 +66957,22 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2569] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19f18,
+	[3149] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ee00,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54029,20 +66981,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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2570] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a0d8,
+	[3150] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e910,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54051,44 +67000,38 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2571] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c598,
+	[3151] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f44c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2572] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e758,
+	[3152] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ef5c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54097,22 +67040,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2573] = {
-	.class_hid = BNXT_ULP_CLASS_HID_182d4,
+	[3153] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fbac,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54121,19 +67061,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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2574] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a794,
+	[3154] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f2bc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54142,20 +67081,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2575] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c954,
+	[3155] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e1e8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54164,20 +67102,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2576] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ea14,
+	[3156] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f8f8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54186,21 +67123,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2577] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b0b8,
+	[3157] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f2f4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54209,18 +67145,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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2578] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b278,
+	[3158] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ed84,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 232,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54229,19 +67165,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2579] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f738,
+	[3159] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f830,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 233,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54250,19 +67186,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2580] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f8f8,
+	[3160] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f414,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 234,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54271,20 +67207,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2581] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8d8c,
+	[3161] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fc10,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 235,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54293,19 +67229,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2582] = {
-	.class_hid = BNXT_ULP_CLASS_HID_af4c,
+	[3162] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f720,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 235,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54314,20 +67250,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2583] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f00c,
+	[3163] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e25c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 235,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54336,20 +67272,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2584] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f5cc,
+	[3164] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fd6c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 235,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54358,21 +67294,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2585] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a38c,
+	[3165] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4eb54,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 235,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54381,20 +67317,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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2586] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a54c,
+	[3166] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e264,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 235,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54403,21 +67337,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2587] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e60c,
+	[3167] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f090,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 236,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54426,21 +67358,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2588] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ebcc,
+	[3168] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4eba0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 237,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54449,22 +67379,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2589] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a6b8,
+	[3169] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f4f0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54473,19 +67401,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2590] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a878,
+	[3170] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ef80,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54494,20 +67422,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2591] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ed38,
+	[3171] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fa3c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54516,20 +67444,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2592] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eef8,
+	[3172] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f5cc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54538,21 +67466,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2593] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d52c,
+	[3173] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ef38,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54561,19 +67489,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2594] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f6ec,
+	[3174] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e6c8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54582,20 +67510,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2595] = {
-	.class_hid = BNXT_ULP_CLASS_HID_dbac,
+	[3175] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f504,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54604,20 +67532,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2596] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fd6c,
+	[3176] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f158,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54626,21 +67554,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2597] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ae70,
+	[3177] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f964,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54649,20 +67577,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2598] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f330,
+	[3178] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f074,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54671,21 +67599,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2599] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d4f0,
+	[3179] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fea0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54694,21 +67622,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2600] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f9b0,
+	[3180] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f9b0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54717,22 +67645,22 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2601] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c470,
+	[3181] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e400,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54741,21 +67669,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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2602] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e930,
+	[3182] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ff10,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54764,22 +67689,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2603] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1caf0,
+	[3183] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ea4c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54788,22 +67710,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2604] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f084,
+	[3184] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e55c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54812,23 +67731,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2605] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cb2c,
+	[3185] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f1ac,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54837,20 +67753,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2606] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b130,
+	[3186] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e8bc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54859,21 +67774,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2607] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d2f0,
+	[3187] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f7e8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54882,21 +67796,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2608] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f7b0,
+	[3188] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1eef8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54905,22 +67818,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2609] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a1d0,
+	[3189] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e8f4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54929,35 +67841,41 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2610] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a290,
+	[3190] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e4c8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2611] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e450,
+	[3191] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f304,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54966,17 +67884,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2612] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e910,
+	[3192] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ea14,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -54985,18 +67906,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2613] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ba24,
+	[3193] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f210,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55005,17 +67929,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2614] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bfe4,
+	[3194] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ed20,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55024,18 +67951,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2615] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e0a4,
+	[3195] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f85c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55044,18 +67974,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2616] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e264,
+	[3196] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f7b0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55064,19 +67997,22 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2617] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d024,
+	[3197] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e154,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55085,18 +68021,19 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2618] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f5e4,
+	[3198] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f864,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55105,19 +68042,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2619] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d6a4,
+	[3199] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e690,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55126,19 +68064,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2620] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f864,
+	[3200] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e1a0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55147,20 +68086,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2621] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d7d0,
+	[3201] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5eaf0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55169,17 +68109,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2622] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f890,
+	[3202] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e580,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55188,18 +68131,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2623] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1da50,
+	[3203] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f03c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55208,18 +68154,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2624] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ff10,
+	[3204] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ebcc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55228,19 +68177,22 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2625] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c244,
+	[3205] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e538,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55249,17 +68201,20 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2626] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e704,
+	[3206] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e11c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55268,18 +68223,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2627] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c8c4,
+	[3207] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5eb04,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55288,18 +68246,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2628] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ed84,
+	[3208] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e758,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55308,19 +68269,22 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2629] = {
-	.class_hid = BNXT_ULP_CLASS_HID_de88,
+	[3209] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ef64,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55329,18 +68293,21 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2630] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e048,
+	[3210] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e674,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55349,19 +68316,22 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2631] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c508,
+	[3211] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f4a0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55370,19 +68340,22 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2632] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e6c8,
+	[3212] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f084,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -55391,5188 +68364,5399 @@ 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_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2633] = {
-	.class_hid = BNXT_ULP_CLASS_HID_199dc,
+	[3213] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22998,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2634] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ba9c,
+	[3214] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24088,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2635] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dc5c,
+	[3215] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22f54,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2636] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e11c,
+	[3216] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24644,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2637] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19c88,
+	[3217] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23334,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2638] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1be48,
+	[3218] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22a24,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2639] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c308,
+	[3219] = {
+	.class_hid = BNXT_ULP_CLASS_HID_238f0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2640] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e4c8,
+	[3220] = {
+	.class_hid = BNXT_ULP_CLASS_HID_253e0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2641] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8b7c,
+	[3221] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24dec,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2642] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ac3c,
+	[3222] = {
+	.class_hid = BNXT_ULP_CLASS_HID_209d0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2643] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f1fc,
+	[3223] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2149c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2644] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f2bc,
+	[3224] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20f8c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2645] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8440,
+	[3225] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25788,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2646] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a900,
+	[3226] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2136c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2647] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cac0,
+	[3227] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25d44,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2648] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ef80,
+	[3228] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21928,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2649] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ba40,
+	[3229] = {
+	.class_hid = BNXT_ULP_CLASS_HID_234a8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2650] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bf00,
+	[3230] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22fd8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2651] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e0c0,
+	[3231] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23a64,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2652] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e580,
+	[3232] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25594,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2653] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a17c,
+	[3233] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21e44,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2654] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a23c,
+	[3234] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23974,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2655] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e7fc,
+	[3235] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20400,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2656] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e8bc,
+	[3236] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23f30,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2657] = {
-	.class_hid = BNXT_ULP_CLASS_HID_afe0,
+	[3237] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2593c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2658] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f0a0,
+	[3238] = {
+	.class_hid = BNXT_ULP_CLASS_HID_214e0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2659] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d260,
+	[3239] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25ef8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2660] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f720,
+	[3240] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21adc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32772,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2661] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a834,
+	[3241] = {
+	.class_hid = BNXT_ULP_CLASS_HID_222d8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2662] = {
-	.class_hid = BNXT_ULP_CLASS_HID_adf4,
+	[3242] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25dc8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2663] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eeb4,
+	[3243] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22894,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2664] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f074,
+	[3244] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24384,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 32836,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2665] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1de34,
+	[3245] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6224c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2666] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e3f4,
+	[3246] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65d7c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2667] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c4b4,
+	[3247] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62808,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2668] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e674,
+	[3248] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64338,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2669] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c5e0,
+	[3249] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60fe8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2670] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e6a0,
+	[3250] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62718,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2671] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c860,
+	[3251] = {
+	.class_hid = BNXT_ULP_CLASS_HID_635a4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2672] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ed20,
+	[3252] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62cd4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2673] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8c0c,
+	[3253] = {
+	.class_hid = BNXT_ULP_CLASS_HID_646a0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2674] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b1cc,
+	[3254] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60284,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2675] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f28c,
+	[3255] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61150,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2676] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f44c,
+	[3256] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60840,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2677] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8950,
+	[3257] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6507c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2678] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aa10,
+	[3258] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64b6c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2679] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cfd0,
+	[3259] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65638,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2680] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f090,
+	[3260] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6121c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2681] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bf50,
+	[3261] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6319c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2682] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a010,
+	[3262] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6288c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2683] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e5d0,
+	[3263] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63758,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2684] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e690,
+	[3264] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62e48,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2685] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a20c,
+	[3265] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61b38,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2686] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a7cc,
+	[3266] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63228,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2687] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e88c,
+	[3267] = {
+	.class_hid = BNXT_ULP_CLASS_HID_600f4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2688] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ea4c,
+	[3268] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63be4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2689] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d0f0,
+	[3269] = {
+	.class_hid = BNXT_ULP_CLASS_HID_655f0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2690] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f5b0,
+	[3270] = {
+	.class_hid = BNXT_ULP_CLASS_HID_611d4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2691] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d770,
+	[3271] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65bac,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2692] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f830,
+	[3272] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61790,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49156,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2693] = {
-	.class_hid = BNXT_ULP_CLASS_HID_adc4,
+	[3273] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63f8c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2694] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ae84,
+	[3274] = {
+	.class_hid = BNXT_ULP_CLASS_HID_656bc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2695] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d044,
+	[3275] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62548,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2696] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f504,
+	[3276] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65c78,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 49220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2697] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c3c4,
+	[3277] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35f98,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2698] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e484,
+	[3278] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31b7c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98308,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2699] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c644,
+	[3279] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34554,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2700] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eb04,
+	[3280] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30138,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98308,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2701] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c6f0,
+	[3281] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32934,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2702] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ebb0,
+	[3282] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34024,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98372,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2703] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cd70,
+	[3283] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32ef0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2704] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f304,
+	[3284] = {
+	.class_hid = BNXT_ULP_CLASS_HID_349e0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98372,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2705] = {
-	.class_hid = BNXT_ULP_CLASS_HID_99a8,
+	[3285] = {
+	.class_hid = BNXT_ULP_CLASS_HID_304a0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2706] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bb68,
+	[3286] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33fd0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 238,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98308,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2707] = {
-	.class_hid = BNXT_ULP_CLASS_HID_dc28,
+	[3287] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30a9c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 239,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2708] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e1e8,
+	[3288] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3258c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 240,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98308,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2709] = {
-	.class_hid = BNXT_ULP_CLASS_HID_92fc,
+	[3289] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34d88,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 241,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2710] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b7bc,
+	[3290] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3096c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 241,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98372,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2711] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d97c,
+	[3291] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31438,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 241,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2712] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fa3c,
+	[3292] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30f28,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 241,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98372,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2713] = {
-	.class_hid = BNXT_ULP_CLASS_HID_188fc,
+	[3293] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32aa8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 241,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2714] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1adbc,
+	[3294] = {
+	.class_hid = BNXT_ULP_CLASS_HID_345d8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 241,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98308,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2715] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cf7c,
+	[3295] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35064,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 242,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2716] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f03c,
+	[3296] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34b94,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 243,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98308,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2717] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18fa8,
+	[3297] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33444,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2718] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b168,
+	[3298] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32f74,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98372,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2719] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f228,
+	[3299] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33a00,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2720] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f7e8,
+	[3300] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35530,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98372,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2721] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ba1c,
+	[3301] = {
+	.class_hid = BNXT_ULP_CLASS_HID_313f0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2722] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bfdc,
+	[3302] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30ae0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98308,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2723] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e09c,
+	[3303] = {
+	.class_hid = BNXT_ULP_CLASS_HID_319ac,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2724] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e25c,
+	[3304] = {
+	.class_hid = BNXT_ULP_CLASS_HID_330dc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98308,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2725] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b760,
+	[3305] = {
+	.class_hid = BNXT_ULP_CLASS_HID_358d8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2726] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b820,
+	[3306] = {
+	.class_hid = BNXT_ULP_CLASS_HID_314bc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98372,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2727] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fde0,
+	[3307] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35e94,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2728] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fea0,
+	[3308] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31a78,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98372,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2729] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ad60,
+	[3309] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7584c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2730] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ae20,
+	[3310] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71430,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2731] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d3e0,
+	[3311] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75e08,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2732] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f4a0,
+	[3312] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71dec,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2733] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d01c,
+	[3313] = {
+	.class_hid = BNXT_ULP_CLASS_HID_725e8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2734] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f5dc,
+	[3314] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75d18,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2735] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d69c,
+	[3315] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72ba4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2736] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f85c,
+	[3316] = {
+	.class_hid = BNXT_ULP_CLASS_HID_742d4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2737] = {
-	.class_hid = BNXT_ULP_CLASS_HID_86c0,
+	[3317] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70194,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2738] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ab80,
+	[3318] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73884,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2739] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cd40,
+	[3319] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70750,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2740] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ee00,
+	[3320] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73e40,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2741] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8314,
+	[3321] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7467c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2742] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a4d4,
+	[3322] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70220,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2743] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c994,
+	[3323] = {
+	.class_hid = BNXT_ULP_CLASS_HID_710ec,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2744] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eb54,
+	[3324] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7081c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2745] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b914,
+	[3325] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7279c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2746] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bad4,
+	[3326] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75e8c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2747] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ff94,
+	[3327] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72d58,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2748] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e154,
+	[3328] = {
+	.class_hid = BNXT_ULP_CLASS_HID_74448,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2749] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bcc0,
+	[3329] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73138,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2750] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a180,
+	[3330] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72828,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2751] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e340,
+	[3331] = {
+	.class_hid = BNXT_ULP_CLASS_HID_736f4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2752] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e400,
+	[3332] = {
+	.class_hid = BNXT_ULP_CLASS_HID_751e4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2753] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aab4,
+	[3333] = {
+	.class_hid = BNXT_ULP_CLASS_HID_74bf0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2754] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ac74,
+	[3334] = {
+	.class_hid = BNXT_ULP_CLASS_HID_707d4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2755] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d134,
+	[3335] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71260,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2756] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f2f4,
+	[3336] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70d90,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114692,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2757] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a7f8,
+	[3337] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7558c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2758] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a8b8,
+	[3338] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71170,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2759] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ea78,
+	[3339] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75b48,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2760] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ef38,
+	[3340] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7172c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2761] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ddf8,
+	[3341] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d298,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2762] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1feb8,
+	[3342] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2cd88,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2763] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c078,
+	[3343] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d854,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2764] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e538,
+	[3344] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29438,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2765] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c0b4,
+	[3345] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bc34,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2766] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e274,
+	[3346] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d724,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2767] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c734,
+	[3347] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a5f0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2768] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e8f4,
+	[3348] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2dce0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2769] = {
-	.class_hid = BNXT_ULP_CLASS_HID_906c,
+	[3349] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29ba0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2770] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b52c,
+	[3350] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b2d0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2771] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d6ec,
+	[3351] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2819c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2772] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fbac,
+	[3352] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b88c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2773] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c86c,
+	[3353] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2c088,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2774] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ed2c,
+	[3354] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29c6c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2775] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d330,
+	[3355] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2c644,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2776] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f4f0,
+	[3356] = {
+	.class_hid = BNXT_ULP_CLASS_HID_28228,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2777] = {
-	.class_hid = BNXT_ULP_CLASS_HID_182b0,
+	[3357] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a1a8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2778] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a470,
+	[3358] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d8d8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2779] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c930,
+	[3359] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a764,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2780] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eaf0,
+	[3360] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2de94,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2781] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1866c,
+	[3361] = {
+	.class_hid = BNXT_ULP_CLASS_HID_28b44,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2782] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ab2c,
+	[3362] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a274,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2783] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ccec,
+	[3363] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b100,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2784] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f1ac,
+	[3364] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a830,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2785] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b4d0,
+	[3365] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2c23c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2786] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b990,
+	[3366] = {
+	.class_hid = BNXT_ULP_CLASS_HID_281e0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2787] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fb50,
+	[3367] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2cbf8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2788] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fc10,
+	[3368] = {
+	.class_hid = BNXT_ULP_CLASS_HID_287dc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163844,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2789] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b124,
+	[3369] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2afd8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2790] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b2e4,
+	[3370] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2c6c8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2791] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f7a4,
+	[3371] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d594,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2792] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f964,
+	[3372] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29178,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163908,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2793] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a724,
+	[3373] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6af4c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2794] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a8e4,
+	[3374] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c67c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2795] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eda4,
+	[3375] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d508,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2796] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ef64,
+	[3376] = {
+	.class_hid = BNXT_ULP_CLASS_HID_690ec,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180228,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2797] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1aad0,
+	[3377] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6b8e8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2798] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1af90,
+	[3378] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d018,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2799] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d150,
+	[3379] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6bea4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2800] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f210,
+	[3380] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d9d4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180292,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2801] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8084,
+	[3381] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69494,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2802] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a244,
+	[3382] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68f84,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180228,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2803] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c704,
+	[3383] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69a50,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2804] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e8c4,
+	[3384] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6b540,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180228,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2805] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9dc8,
+	[3385] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6dd7c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2806] = {
-	.class_hid = BNXT_ULP_CLASS_HID_be88,
+	[3386] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69920,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180292,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2807] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c048,
+	[3387] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c338,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2808] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e508,
+	[3388] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69f1c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180292,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2809] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b3c8,
+	[3389] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6ba9c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2810] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b488,
+	[3390] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d58c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180228,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2811] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f648,
+	[3391] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a058,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2812] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fb08,
+	[3392] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6db48,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180228,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2813] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b684,
+	[3393] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68438,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2814] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b844,
+	[3394] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6bf28,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180292,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2815] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fd04,
+	[3395] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68df4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2816] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fec4,
+	[3396] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a4e4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180292,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2817] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a568,
+	[3397] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6def0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2818] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a628,
+	[3398] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69ad4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180228,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2819] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ebe8,
+	[3399] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c4ac,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2820] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eca8,
+	[3400] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68090,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180228,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2821] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a1bc,
+	[3401] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a88c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2822] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a37c,
+	[3402] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c3bc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180292,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2823] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e43c,
+	[3403] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6ae48,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2824] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e9fc,
+	[3404] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c978,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180292,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2825] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d7bc,
+	[3405] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3c898,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2826] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f97c,
+	[3406] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3847c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2827] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1da3c,
+	[3407] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39308,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2828] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fffc,
+	[3408] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38a38,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2829] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1db68,
+	[3409] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d234,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2830] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fc28,
+	[3410] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3cd24,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2831] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c1e8,
+	[3411] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3dbf0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2832] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e2a8,
+	[3412] = {
+	.class_hid = BNXT_ULP_CLASS_HID_397d4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2833] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9ab8,
+	[3413] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b1a0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2834] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bc78,
+	[3414] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a8d0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2835] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c138,
+	[3415] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b79c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2836] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e2f8,
+	[3416] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3ae8c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2837] = {
-	.class_hid = BNXT_ULP_CLASS_HID_978c,
+	[3417] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39b7c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2838] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b94c,
+	[3418] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b26c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2839] = {
-	.class_hid = BNXT_ULP_CLASS_HID_da0c,
+	[3419] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38138,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2840] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ffcc,
+	[3420] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b828,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2841] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18d8c,
+	[3421] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d7a8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2842] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1af4c,
+	[3422] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3938c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2843] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f00c,
+	[3423] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3dd64,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2844] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f5cc,
+	[3424] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39948,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2845] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b0b8,
+	[3425] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a144,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2846] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b278,
+	[3426] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d874,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2847] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f738,
+	[3427] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a700,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2848] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f8f8,
+	[3428] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3de30,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2849] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bf2c,
+	[3429] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39cf0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2850] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a0ec,
+	[3430] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b7e0,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2851] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e5ac,
+	[3431] = {
+	.class_hid = BNXT_ULP_CLASS_HID_382ac,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2852] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e76c,
+	[3432] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3bddc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229380,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2853] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b870,
+	[3433] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3c5d8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2854] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bd30,
+	[3434] = {
+	.class_hid = BNXT_ULP_CLASS_HID_381bc,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2855] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fef0,
+	[3435] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3cb94,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2856] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e3b0,
+	[3436] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38778,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229444,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2857] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ae70,
+	[3437] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c54c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2858] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f330,
+	[3438] = {
+	.class_hid = BNXT_ULP_CLASS_HID_78130,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245764,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2859] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d4f0,
+	[3439] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7cb08,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2860] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f9b0,
+	[3440] = {
+	.class_hid = BNXT_ULP_CLASS_HID_786ec,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245764,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2861] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d52c,
+	[3441] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7aee8,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2862] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f6ec,
+	[3442] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c618,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245828,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2863] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dbac,
+	[3443] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d4a4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2864] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fd6c,
+	[3444] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79088,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245828,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2865] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34d0,
+	[3445] = {
+	.class_hid = BNXT_ULP_CLASS_HID_78a94,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2866] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a1c,
+	[3446] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a584,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245764,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2867] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3760,
+	[3447] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b050,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2868] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5e80,
+	[3448] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7ab40,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245764,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2869] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5bd4,
+	[3449] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79430,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2870] = {
-	.class_hid = BNXT_ULP_CLASS_HID_07b8,
+	[3450] = {
+	.class_hid = BNXT_ULP_CLASS_HID_78f20,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245828,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2871] = {
-	.class_hid = BNXT_ULP_CLASS_HID_008c,
+	[3451] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79dec,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2872] = {
-	.class_hid = BNXT_ULP_CLASS_HID_282c,
+	[3452] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b51c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245828,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2873] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2570,
+	[3453] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d09c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2874] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3124,
+	[3454] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7cb8c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245764,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2875] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5944,
+	[3455] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d658,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2876] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5588,
+	[3456] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7923c,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245764,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2877] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e7c,
+	[3457] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7ba38,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2878] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b40,
+	[3458] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d528,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245828,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2879] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22e0,
+	[3459] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a3f4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2880] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3f34,
+	[3460] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7dae4,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
-	.flow_sig_id = 244,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245828,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2881] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a77c,
+	[3461] = {
+	.class_hid = BNXT_ULP_CLASS_HID_799a4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2882] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a8bc,
+	[3462] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b0d4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245764,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2883] = {
-	.class_hid = BNXT_ULP_CLASS_HID_edfc,
+	[3463] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79f60,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2884] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ef3c,
+	[3464] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b690,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245764,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2885] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a000,
+	[3465] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7de8c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2886] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a540,
+	[3466] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79a70,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2887] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e680,
+	[3467] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c448,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2888] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ebc0,
+	[3468] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7802c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245828,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2889] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d600,
+	[3469] = {
+	.class_hid = BNXT_ULP_CLASS_HID_86a0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60581,19 +73765,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2890] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fb40,
+	[3470] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a1b0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60602,20 +73782,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2891] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dc80,
+	[3471] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8c6c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60624,20 +73800,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2892] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e1c0,
+	[3472] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a77c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60646,21 +73818,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2893] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dd7c,
+	[3473] = {
+	.class_hid = BNXT_ULP_CLASS_HID_900c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60669,18 +73837,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2894] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1febc,
+	[3474] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8b1c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60689,19 +73855,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2895] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c3fc,
+	[3475] = {
+	.class_hid = BNXT_ULP_CLASS_HID_99c8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60710,19 +73874,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2896] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e53c,
+	[3476] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b0d8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60731,20 +73893,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2897] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cbe0,
+	[3477] = {
+	.class_hid = BNXT_ULP_CLASS_HID_aad4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60753,18 +73913,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2898] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b1f4,
+	[3478] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c224,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60773,19 +73931,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2899] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d334,
+	[3479] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d090,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60794,19 +73950,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2900] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f474,
+	[3480] = {
+	.class_hid = BNXT_ULP_CLASS_HID_cbe0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60815,20 +73969,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2901] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c4b4,
+	[3481] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b4b0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60837,19 +73989,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2902] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e9f4,
+	[3482] = {
+	.class_hid = BNXT_ULP_CLASS_HID_af80,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60858,20 +74008,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2903] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cb34,
+	[3483] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ba7c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60880,20 +74028,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2904] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f138,
+	[3484] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d54c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60902,21 +74048,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2905] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19f78,
+	[3485] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48374,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60925,20 +74069,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2906] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a0b8,
+	[3486] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ba44,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60947,21 +74087,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2907] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c5f8,
+	[3487] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48930,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60970,21 +74106,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2908] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e738,
+	[3488] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a000,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -60993,22 +74125,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2909] = {
-	.class_hid = BNXT_ULP_CLASS_HID_182b4,
+	[3489] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c80c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61017,19 +74145,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2910] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a7f4,
+	[3490] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48420,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61038,20 +74164,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2911] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c934,
+	[3491] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4929c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61060,43 +74184,39 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2912] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ea74,
+	[3492] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48dec,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2913] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b0d8,
+	[3493] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a798,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61105,18 +74225,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2914] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b218,
+	[3494] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4dee8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 244,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61125,19 +74244,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2915] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f758,
+	[3495] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ada4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 245,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61146,19 +74264,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2916] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f898,
+	[3496] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c4b4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 246,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131076,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61167,20 +74284,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2917] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8dec,
+	[3497] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b144,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 247,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61189,19 +74305,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2918] = {
-	.class_hid = BNXT_ULP_CLASS_HID_af2c,
+	[3498] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a854,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 247,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61210,20 +74325,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2919] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f06c,
+	[3499] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b700,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 247,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61232,20 +74346,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2920] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f5ac,
+	[3500] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ae10,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 247,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 131140,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61254,21 +74367,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2921] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a3ec,
+	[3501] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1bca0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 247,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61277,20 +74389,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2922] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a52c,
+	[3502] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d7b0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 247,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61299,21 +74407,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2923] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e66c,
+	[3503] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a26c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 248,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61322,21 +74426,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2924] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ebac,
+	[3504] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1dd7c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 249,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61345,22 +74445,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2925] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a6d8,
+	[3505] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1860c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61369,19 +74465,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2926] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a818,
+	[3506] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a11c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61390,20 +74484,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2927] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ed58,
+	[3507] = {
+	.class_hid = BNXT_ULP_CLASS_HID_18fc8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61412,20 +74504,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2928] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ee98,
+	[3508] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a6d8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61434,21 +74524,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2929] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d54c,
+	[3509] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c0d4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61457,19 +74545,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2930] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f68c,
+	[3510] = {
+	.class_hid = BNXT_ULP_CLASS_HID_19ce8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61478,20 +74564,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2931] = {
-	.class_hid = BNXT_ULP_CLASS_HID_dbcc,
+	[3511] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c690,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61500,20 +74584,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2932] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fd0c,
+	[3512] = {
+	.class_hid = BNXT_ULP_CLASS_HID_182b4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61522,21 +74604,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2933] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ae10,
+	[3513] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1aab0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61545,20 +74625,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2934] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f350,
+	[3514] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c580,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61567,21 +74645,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2935] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d490,
+	[3515] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d07c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61590,21 +74666,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2936] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f9d0,
+	[3516] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1cb4c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61613,22 +74687,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2937] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c410,
+	[3517] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b974,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61637,21 +74709,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2938] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e950,
+	[3518] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d044,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61660,22 +74728,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2939] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ca90,
+	[3519] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bf30,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61684,22 +74748,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2940] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f0e4,
+	[3520] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d600,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61708,23 +74768,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2941] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cb4c,
+	[3521] = {
+	.class_hid = BNXT_ULP_CLASS_HID_582d0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61733,20 +74789,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2942] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b150,
+	[3522] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ba20,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61755,21 +74809,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2943] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d290,
+	[3523] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5889c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61778,21 +74830,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2944] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f7d0,
+	[3524] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a3ec,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61801,22 +74851,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2945] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a1b0,
+	[3525] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5dd98,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61825,16 +74873,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2946] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a2f0,
+	[3526] = {
+	.class_hid = BNXT_ULP_CLASS_HID_599bc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61843,17 +74893,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2947] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e430,
+	[3527] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c3a4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196608,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61862,17 +74914,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2948] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e970,
+	[3528] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59f78,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196612,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61881,18 +74935,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2949] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ba44,
+	[3529] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a744,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61901,17 +74957,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2950] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bf84,
+	[3530] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5de54,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61920,18 +74978,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2951] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e0c4,
+	[3531] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ad00,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196672,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61940,18 +75000,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2952] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e204,
+	[3532] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c410,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 196676,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61960,19 +75022,21 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2953] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d044,
+	[3533] = {
+	.class_hid = BNXT_ULP_CLASS_HID_cd20,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -61981,18 +75045,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2954] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f584,
+	[3534] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e430,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62001,19 +75063,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2955] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d6c4,
+	[3535] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f2ec,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62022,19 +75082,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2956] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f804,
+	[3536] = {
+	.class_hid = BNXT_ULP_CLASS_HID_edfc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62043,20 +75101,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2957] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d7b0,
+	[3537] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d68c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62065,17 +75121,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2958] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f8f0,
+	[3538] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f19c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62084,18 +75140,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2959] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1da30,
+	[3539] = {
+	.class_hid = BNXT_ULP_CLASS_HID_dc48,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62104,18 +75160,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2960] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ff70,
+	[3540] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f758,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62124,19 +75180,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2961] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c224,
+	[3541] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d154,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62145,17 +75201,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2962] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e764,
+	[3542] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c8a4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62164,18 +75220,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2963] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c8a4,
+	[3543] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d710,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62184,18 +75240,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2964] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ede4,
+	[3544] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d334,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62204,19 +75260,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2965] = {
-	.class_hid = BNXT_ULP_CLASS_HID_dee8,
+	[3545] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fb30,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62225,18 +75281,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2966] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e028,
+	[3546] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d200,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62245,19 +75301,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2967] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c568,
+	[3547] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e0fc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62266,19 +75322,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2968] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e6a8,
+	[3548] = {
+	.class_hid = BNXT_ULP_CLASS_HID_dbcc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62287,20 +75343,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2969] = {
-	.class_hid = BNXT_ULP_CLASS_HID_199bc,
+	[3549] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c9f4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62309,19 +75365,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2970] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bafc,
+	[3550] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e0c4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62330,20 +75384,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2971] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dc3c,
+	[3551] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4cfb0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62352,20 +75404,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2972] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e17c,
+	[3552] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e680,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62374,21 +75424,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2973] = {
-	.class_hid = BNXT_ULP_CLASS_HID_19ce8,
+	[3553] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d350,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62397,18 +75445,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2974] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1be28,
+	[3554] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4caa0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62417,19 +75465,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2975] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c368,
+	[3555] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d91c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62438,19 +75486,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2976] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e4a8,
+	[3556] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f06c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62459,20 +75507,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2977] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8b1c,
+	[3557] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ea18,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62481,17 +75529,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2978] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ac5c,
+	[3558] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c568,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62500,18 +75549,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2979] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f19c,
+	[3559] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d024,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393216,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62520,18 +75570,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2980] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f2dc,
+	[3560] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4cb34,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393220,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62540,19 +75591,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2981] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8420,
+	[3561] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f7c4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62561,18 +75613,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2982] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a960,
+	[3562] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4eed4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62581,19 +75634,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2983] = {
-	.class_hid = BNXT_ULP_CLASS_HID_caa0,
+	[3563] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fd80,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393280,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62602,19 +75656,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2984] = {
-	.class_hid = BNXT_ULP_CLASS_HID_efe0,
+	[3564] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4d490,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 393284,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62623,20 +75678,21 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2985] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ba20,
+	[3565] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e320,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62645,19 +75701,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2986] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bf60,
+	[3566] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1da30,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62666,20 +75720,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2987] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e0a0,
+	[3567] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e8ec,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62688,20 +75740,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2988] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e5e0,
+	[3568] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c3fc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62710,21 +75760,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2989] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a11c,
+	[3569] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1cc8c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62733,18 +75781,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2990] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a25c,
+	[3570] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e79c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62753,19 +75801,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2991] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e79c,
+	[3571] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f248,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62774,19 +75822,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2992] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e8dc,
+	[3572] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ed58,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62795,20 +75843,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2993] = {
-	.class_hid = BNXT_ULP_CLASS_HID_af80,
+	[3573] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c754,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62817,18 +75865,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2994] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f0c0,
+	[3574] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c368,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62837,19 +75885,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2995] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d200,
+	[3575] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1cd10,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62858,19 +75906,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2996] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f740,
+	[3576] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c934,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62879,20 +75927,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2997] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a854,
+	[3577] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d130,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62901,19 +75949,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2998] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ad94,
+	[3578] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c800,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62922,20 +75970,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[2999] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eed4,
+	[3579] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d6fc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62944,20 +75992,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3000] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f014,
+	[3580] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d290,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62966,21 +76014,21 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3001] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1de54,
+	[3581] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5fff4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -62989,20 +76037,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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3002] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e394,
+	[3582] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d6c4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63011,21 +76057,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3003] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c4d4,
+	[3583] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e5b0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63034,21 +76078,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3004] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e614,
+	[3584] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5dc80,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63057,22 +76099,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3005] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c580,
+	[3585] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c950,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63081,19 +76121,19 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3006] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e6c0,
+	[3586] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e0a0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63102,20 +76142,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3007] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c800,
+	[3587] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5cf1c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63124,20 +76164,20 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3008] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ed40,
+	[3588] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e66c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63146,21 +76186,21 @@ 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_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3009] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8c6c,
+	[3589] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c018,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63169,16 +76209,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3010] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b1ac,
+	[3590] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5dc3c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63187,17 +76230,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3011] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f2ec,
+	[3591] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c624,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458752,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63206,17 +76252,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3012] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f42c,
+	[3592] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c5f8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458756,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63225,18 +76274,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3013] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8930,
+	[3593] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5edc4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63245,17 +76297,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3014] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aa70,
+	[3594] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c4d4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63264,18 +76319,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3015] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cfb0,
+	[3595] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d380,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458816,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63284,18 +76342,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3016] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f0f0,
+	[3596] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ca90,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 458820,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63304,19 +76365,22 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3017] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bf30,
+	[3597] = {
+	.class_hid = BNXT_ULP_CLASS_HID_abe0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63325,18 +76389,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3018] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a070,
+	[3598] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a2f0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63345,19 +76407,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3019] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e5b0,
+	[3599] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b1ac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63366,19 +76426,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3020] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e6f0,
+	[3600] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a8bc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63387,20 +76445,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3021] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a26c,
+	[3601] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b54c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63409,17 +76465,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3022] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a7ac,
+	[3602] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ac5c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63428,18 +76484,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3023] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e8ec,
+	[3603] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bb08,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63448,18 +76504,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3024] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ea2c,
+	[3604] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b218,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63468,19 +76524,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3025] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d090,
+	[3605] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ac14,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63489,17 +76545,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3026] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f5d0,
+	[3606] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e764,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63508,18 +76564,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3027] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d710,
+	[3607] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f5d0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63528,18 +76584,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3028] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f850,
+	[3608] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b1f4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63548,19 +76604,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3029] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ada4,
+	[3609] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b9f0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63569,18 +76625,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3030] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aee4,
+	[3610] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f0c0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63589,19 +76645,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3031] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d024,
+	[3611] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bfbc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63610,19 +76666,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3032] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f564,
+	[3612] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f68c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63631,20 +76687,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3033] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c3a4,
+	[3613] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a4b4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63653,19 +76709,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3034] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e4e4,
+	[3614] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4bf84,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63674,20 +76728,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3035] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c624,
+	[3615] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4aa70,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63696,20 +76748,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3036] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1eb64,
+	[3616] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a540,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63718,21 +76768,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3037] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c690,
+	[3617] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ed4c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63741,18 +76789,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3038] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ebd0,
+	[3618] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a960,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63761,19 +76809,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3039] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cd10,
+	[3619] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b7dc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63782,19 +76830,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3040] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f364,
+	[3620] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4af2c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63803,20 +76851,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3041] = {
-	.class_hid = BNXT_ULP_CLASS_HID_99c8,
+	[3621] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a8d8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63825,17 +76873,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3042] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bb08,
+	[3622] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e028,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 250,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63844,18 +76893,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3043] = {
-	.class_hid = BNXT_ULP_CLASS_HID_dc48,
+	[3623] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4aee4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 251,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655360,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63864,18 +76914,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3044] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e188,
+	[3624] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e9f4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 252,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655364,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63884,19 +76935,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3045] = {
-	.class_hid = BNXT_ULP_CLASS_HID_929c,
+	[3625] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b284,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 253,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63905,18 +76957,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3046] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b7dc,
+	[3626] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ad94,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 253,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63925,19 +76978,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3047] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d91c,
+	[3627] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b840,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 253,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655424,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63946,19 +77000,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3048] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fa5c,
+	[3628] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f350,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 253,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 655428,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63967,20 +77022,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3049] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1889c,
+	[3629] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a1e0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 253,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -63989,19 +77045,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3050] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1addc,
+	[3630] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f8f0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 253,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64010,20 +77064,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3051] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cf1c,
+	[3631] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a7ac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 254,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64032,20 +77084,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3052] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f05c,
+	[3632] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1febc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 255,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64054,21 +77104,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3053] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18fc8,
+	[3633] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ab4c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64077,18 +77125,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3054] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b108,
+	[3634] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a25c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64097,19 +77145,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3055] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f248,
+	[3635] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b108,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64118,19 +77166,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3056] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f788,
+	[3636] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a818,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64139,20 +77187,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3057] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ba7c,
+	[3637] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e214,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64161,18 +77209,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3058] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bfbc,
+	[3638] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1be28,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64181,19 +77229,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3059] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e0fc,
+	[3639] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ebd0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64202,19 +77250,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3060] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e23c,
+	[3640] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a7f4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64223,20 +77271,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3061] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b700,
+	[3641] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1aff0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64245,19 +77293,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3062] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b840,
+	[3642] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e6c0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64266,20 +77314,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3063] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fd80,
+	[3643] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f5bc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64288,20 +77336,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3064] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fec0,
+	[3644] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b150,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64310,21 +77358,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3065] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ad00,
+	[3645] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bab4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64333,20 +77381,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3066] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ae40,
+	[3646] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f584,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64355,21 +77401,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3067] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d380,
+	[3647] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a070,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64378,21 +77422,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3068] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f4c0,
+	[3648] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5fb40,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64401,22 +77443,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3069] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d07c,
+	[3649] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a410,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64425,19 +77465,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3070] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f5bc,
+	[3650] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bf60,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64446,20 +77486,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3071] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d6fc,
+	[3651] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5addc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64468,20 +77508,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3072] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f83c,
+	[3652] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a52c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64490,21 +77530,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3073] = {
-	.class_hid = BNXT_ULP_CLASS_HID_86a0,
+	[3653] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5fed8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64513,15 +77553,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3074] = {
-	.class_hid = BNXT_ULP_CLASS_HID_abe0,
+	[3654] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bafc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64530,16 +77574,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3075] = {
-	.class_hid = BNXT_ULP_CLASS_HID_cd20,
+	[3655] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e4e4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64548,16 +77596,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3076] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ee60,
+	[3656] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a0b8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720900,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64566,17 +77618,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3077] = {
-	.class_hid = BNXT_ULP_CLASS_HID_8374,
+	[3657] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a884,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64585,16 +77641,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3078] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a4b4,
+	[3658] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e394,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64603,17 +77663,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3079] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c9f4,
+	[3659] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ae40,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64622,17 +77686,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3080] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eb34,
+	[3660] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e950,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 720964,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64641,18 +77709,22 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3081] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b974,
+	[3661] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ee60,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64661,17 +77733,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3082] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bab4,
+	[3662] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e970,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64680,18 +77752,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3083] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fff4,
+	[3663] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f42c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64700,18 +77772,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3084] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e134,
+	[3664] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ef3c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64720,19 +77792,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3085] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1bca0,
+	[3665] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fbcc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64741,16 +77813,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3086] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a1e0,
+	[3666] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f2dc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64759,17 +77833,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3087] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e320,
+	[3667] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e188,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64778,17 +77854,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3088] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e460,
+	[3668] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f898,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64797,18 +77875,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3089] = {
-	.class_hid = BNXT_ULP_CLASS_HID_aad4,
+	[3669] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f294,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64817,16 +77897,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3090] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ac14,
+	[3670] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ede4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64835,17 +77917,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3091] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d154,
+	[3671] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f850,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64854,17 +77938,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3092] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f294,
+	[3672] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f474,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64873,18 +77959,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3093] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a798,
+	[3673] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fc70,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64893,17 +77981,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3094] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a8d8,
+	[3674] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f740,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64912,18 +78002,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3095] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ea18,
+	[3675] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e23c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64932,18 +78024,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3096] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ef58,
+	[3676] = {
+	.class_hid = BNXT_ULP_CLASS_HID_fd0c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64952,19 +78046,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3097] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dd98,
+	[3677] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4eb34,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64973,18 +78069,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3098] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fed8,
+	[3678] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e204,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -64993,19 +78089,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3099] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c018,
+	[3679] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f0f0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65014,19 +78110,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3100] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e558,
+	[3680] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ebc0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65035,20 +78131,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3101] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c0d4,
+	[3681] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f490,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65057,17 +78153,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3102] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e214,
+	[3682] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4efe0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65076,18 +78174,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3103] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c754,
+	[3683] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fa5c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65096,18 +78196,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3104] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e894,
+	[3684] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f5ac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65116,19 +78218,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3105] = {
-	.class_hid = BNXT_ULP_CLASS_HID_900c,
+	[3685] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ef58,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65137,16 +78241,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3106] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b54c,
+	[3686] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e6a8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65155,17 +78262,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3107] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d68c,
+	[3687] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f564,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65174,17 +78284,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3108] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fbcc,
+	[3688] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f138,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917508,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65193,18 +78306,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3109] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c80c,
+	[3689] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f904,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65213,17 +78329,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3110] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ed4c,
+	[3690] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f014,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65232,18 +78351,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3111] = {
-	.class_hid = BNXT_ULP_CLASS_HID_d350,
+	[3691] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fec0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65252,18 +78374,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3112] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f490,
+	[3692] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f9d0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 917572,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65272,19 +78397,22 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3113] = {
-	.class_hid = BNXT_ULP_CLASS_HID_182d0,
+	[3693] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e460,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65293,18 +78421,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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3114] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a410,
+	[3694] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ff70,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65313,19 +78441,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3115] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c950,
+	[3695] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ea2c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65334,19 +78462,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3116] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ea90,
+	[3696] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e53c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65355,20 +78483,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3117] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1860c,
+	[3697] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f1cc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65377,17 +78505,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3118] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ab4c,
+	[3698] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e8dc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65396,18 +78526,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3119] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1cc8c,
+	[3699] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f788,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65416,18 +78548,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3120] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f1cc,
+	[3700] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ee98,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65436,19 +78570,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3121] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b4b0,
+	[3701] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e894,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65457,17 +78593,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3122] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b9f0,
+	[3702] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e4a8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65476,18 +78614,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3123] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fb30,
+	[3703] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f364,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65496,18 +78636,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3124] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fc70,
+	[3704] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ea74,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65516,19 +78658,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3125] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b144,
+	[3705] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f270,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65537,18 +78681,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3126] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b284,
+	[3706] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ed40,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65557,19 +78703,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3127] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f7c4,
+	[3707] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f83c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65578,19 +78726,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3128] = {
-	.class_hid = BNXT_ULP_CLASS_HID_f904,
+	[3708] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f7d0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65599,20 +78749,22 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3129] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a744,
+	[3709] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e134,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65621,19 +78773,19 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3130] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1a884,
+	[3710] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f804,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65642,20 +78794,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3131] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1edc4,
+	[3711] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e6f0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65664,20 +78816,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3132] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ef04,
+	[3712] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e1c0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983044,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65686,21 +78838,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3133] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1aab0,
+	[3713] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ea90,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65709,18 +78861,20 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3134] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1aff0,
+	[3714] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e5e0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65729,19 +78883,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3135] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d130,
+	[3715] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f05c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65750,19 +78906,21 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3136] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f270,
+	[3716] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ebac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983108,
 	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
@@ -65771,21 +78929,23 @@ 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_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3137] = {
-	.class_hid = BNXT_ULP_CLASS_HID_80e4,
+	[3717] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e558,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -65793,16 +78953,21 @@ 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_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3138] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a224,
+	[3718] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e17c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983044,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -65810,17 +78975,22 @@ 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_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3139] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c764,
+	[3719] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5eb64,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -65828,17 +78998,22 @@ 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_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3140] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e8a4,
+	[3720] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e738,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983044,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -65846,18 +79021,23 @@ 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_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3141] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9da8,
+	[3721] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ef04,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -65865,17 +79045,22 @@ 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_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3142] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bee8,
+	[3722] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e614,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983108,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -65883,18 +79068,23 @@ 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_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3143] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c028,
+	[3723] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f4c0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -65902,18 +79092,23 @@ 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_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3144] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e568,
+	[3724] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f0e4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 11,
+	.flow_sig_id = 983108,
+	.flow_pattern_id = 0,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -65921,4027 +79116,3632 @@ 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_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3145] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b3a8,
+	[3725] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5802,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3146] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b4e8,
+	[3726] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e46,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3147] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f628,
+	[3727] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d76,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3148] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fb68,
+	[3728] = {
+	.class_hid = BNXT_ULP_CLASS_HID_02ba,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3149] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b6e4,
+	[3729] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32a2,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3150] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b824,
+	[3730] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38e6,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3151] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fd64,
+	[3731] = {
+	.class_hid = BNXT_ULP_CLASS_HID_52ca,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3152] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fea4,
+	[3732] = {
+	.class_hid = BNXT_ULP_CLASS_HID_580e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3153] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a508,
+	[3733] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44996,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3154] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a648,
+	[3734] = {
+	.class_hid = BNXT_ULP_CLASS_HID_410e6,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3155] = {
-	.class_hid = BNXT_ULP_CLASS_HID_eb88,
+	[3735] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42036,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3156] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ecc8,
+	[3736] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4264a,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 16384,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3157] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a1dc,
+	[3737] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45ffe,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3158] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a31c,
+	[3738] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44532,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3159] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e45c,
+	[3739] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4399e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3160] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e99c,
+	[3740] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43fd2,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 24576,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3161] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d7dc,
+	[3741] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23da0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3162] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f91c,
+	[3742] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2239c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3163] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1da5c,
+	[3743] = {
+	.class_hid = BNXT_ULP_CLASS_HID_207fc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3164] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ff9c,
+	[3744] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20d38,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3165] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1db08,
+	[3745] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25e34,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3166] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fc48,
+	[3746] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24470,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3167] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1c188,
+	[3747] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22850,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3168] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e2c8,
+	[3748] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2518c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3169] = {
-	.class_hid = BNXT_ULP_CLASS_HID_9ad8,
+	[3749] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20970,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3170] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bc18,
+	[3750] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20eac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3171] = {
-	.class_hid = BNXT_ULP_CLASS_HID_c158,
+	[3751] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2128c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3172] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e298,
+	[3752] = {
+	.class_hid = BNXT_ULP_CLASS_HID_218c8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3173] = {
-	.class_hid = BNXT_ULP_CLASS_HID_97ec,
+	[3753] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22dc4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3174] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b92c,
+	[3754] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25300,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3175] = {
-	.class_hid = BNXT_ULP_CLASS_HID_da6c,
+	[3755] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23760,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3176] = {
-	.class_hid = BNXT_ULP_CLASS_HID_ffac,
+	[3756] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23d5c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3177] = {
-	.class_hid = BNXT_ULP_CLASS_HID_18dec,
+	[3757] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63694,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3178] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1af2c,
+	[3758] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63cd0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3179] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f06c,
+	[3759] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60030,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3180] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f5ac,
+	[3760] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6066c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3181] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b0d8,
+	[3761] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65b68,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3182] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b218,
+	[3762] = {
+	.class_hid = BNXT_ULP_CLASS_HID_640a4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3183] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f758,
+	[3763] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62484,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3184] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f898,
+	[3764] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62ac0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3185] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bf4c,
+	[3765] = {
+	.class_hid = BNXT_ULP_CLASS_HID_605a4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3186] = {
-	.class_hid = BNXT_ULP_CLASS_HID_a08c,
+	[3766] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60be0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3187] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e5cc,
+	[3767] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64a8c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3188] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e70c,
+	[3768] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6153c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3189] = {
-	.class_hid = BNXT_ULP_CLASS_HID_b810,
+	[3769] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62638,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3190] = {
-	.class_hid = BNXT_ULP_CLASS_HID_bd50,
+	[3770] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62c74,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3191] = {
-	.class_hid = BNXT_ULP_CLASS_HID_fe90,
+	[3771] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63054,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3192] = {
-	.class_hid = BNXT_ULP_CLASS_HID_e3d0,
+	[3772] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63990,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3193] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1ae10,
+	[3773] = {
+	.class_hid = BNXT_ULP_CLASS_HID_9a98,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3194] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f350,
+	[3774] = {
+	.class_hid = BNXT_ULP_CLASS_HID_80a4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3195] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d490,
+	[3775] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c3b0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3196] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f9d0,
+	[3776] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c9fc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3197] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1d54c,
+	[3777] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bf0c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3198] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1f68c,
+	[3778] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a548,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3199] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1dbcc,
+	[3779] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8968,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3200] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1fd0c,
+	[3780] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8eb4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3201] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34b0,
+	[3781] = {
+	.class_hid = BNXT_ULP_CLASS_HID_497ac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3202] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a7c,
+	[3782] = {
+	.class_hid = BNXT_ULP_CLASS_HID_49de8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3203] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3700,
+	[3783] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4dcc4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3204] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ee0,
+	[3784] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c200,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3205] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5bb4,
+	[3785] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b850,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3206] = {
-	.class_hid = BNXT_ULP_CLASS_HID_07d8,
+	[3786] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a19c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3207] = {
-	.class_hid = BNXT_ULP_CLASS_HID_00ec,
+	[3787] = {
+	.class_hid = BNXT_ULP_CLASS_HID_485bc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3208] = {
-	.class_hid = BNXT_ULP_CLASS_HID_284c,
+	[3788] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48bf8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3209] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2510,
+	[3789] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b098,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3210] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3144,
+	[3790] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b6a4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3211] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5924,
+	[3791] = {
+	.class_hid = BNXT_ULP_CLASS_HID_19ac4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3212] = {
-	.class_hid = BNXT_ULP_CLASS_HID_55e8,
+	[3792] = {
+	.class_hid = BNXT_ULP_CLASS_HID_18000,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3213] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e1c,
+	[3793] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d50c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3214] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1b20,
+	[3794] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1db48,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3215] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2280,
+	[3795] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1bf68,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3216] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3f54,
+	[3796] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a4b4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV4 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3217] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24604,
+	[3797] = {
+	.class_hid = BNXT_ULP_CLASS_HID_58dac,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3218] = {
-	.class_hid = BNXT_ULP_CLASS_HID_255d4,
+	[3798] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b3e8,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3219] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22e08,
+	[3799] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59708,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3220] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24378,
+	[3800] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59d54,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3221] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20fcc,
+	[3801] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ae50,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3222] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21a9c,
+	[3802] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d79c,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3223] = {
-	.class_hid = BNXT_ULP_CLASS_HID_217d0,
+	[3803] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bbbc,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3224] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20800,
+	[3804] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a1f8,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3225] = {
-	.class_hid = BNXT_ULP_CLASS_HID_253a0,
+	[3805] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5822,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 256,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3226] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23f70,
+	[3806] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e66,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 257,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3227] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23ba4,
+	[3807] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d56,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 257,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3228] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c94,
+	[3808] = {
+	.class_hid = BNXT_ULP_CLASS_HID_029a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4096,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3229] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21968,
+	[3809] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3282,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3230] = {
-	.class_hid = BNXT_ULP_CLASS_HID_243c4,
+	[3810] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38c6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3231] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25c38,
+	[3811] = {
+	.class_hid = BNXT_ULP_CLASS_HID_52ea,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3232] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2125c,
+	[3812] = {
+	.class_hid = BNXT_ULP_CLASS_HID_582e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 6144,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3233] = {
-	.class_hid = BNXT_ULP_CLASS_HID_240c8,
+	[3813] = {
+	.class_hid = BNXT_ULP_CLASS_HID_51ba,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3234] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22f98,
+	[3814] = {
+	.class_hid = BNXT_ULP_CLASS_HID_57fe,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3235] = {
-	.class_hid = BNXT_ULP_CLASS_HID_228cc,
+	[3815] = {
+	.class_hid = BNXT_ULP_CLASS_HID_12ee,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3236] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25d3c,
+	[3816] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1832,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3237] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20990,
+	[3817] = {
+	.class_hid = BNXT_ULP_CLASS_HID_081a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3238] = {
-	.class_hid = BNXT_ULP_CLASS_HID_214a0,
+	[3818] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0e5e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3239] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21194,
+	[3819] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2802,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3240] = {
-	.class_hid = BNXT_ULP_CLASS_HID_202c4,
+	[3820] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2e46,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3241] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22a64,
+	[3821] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4556e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3242] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23934,
+	[3822] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45ab2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3243] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23268,
+	[3823] = {
+	.class_hid = BNXT_ULP_CLASS_HID_419a2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3244] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22758,
+	[3824] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41fe6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3245] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2132c,
+	[3825] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40fce,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3246] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25d88,
+	[3826] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43512,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3247] = {
-	.class_hid = BNXT_ULP_CLASS_HID_256fc,
+	[3827] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42f36,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3248] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24b2c,
+	[3828] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4557a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3249] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22f14,
+	[3829] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42a86,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3250] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23a24,
+	[3830] = {
+	.class_hid = BNXT_ULP_CLASS_HID_450ca,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3251] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23718,
+	[3831] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44aee,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3252] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22848,
+	[3832] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4157e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3253] = {
-	.class_hid = BNXT_ULP_CLASS_HID_214dc,
+	[3833] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40566,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3254] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25eb8,
+	[3834] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40aaa,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3255] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25bec,
+	[3835] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4254e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3256] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21110,
+	[3836] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42a92,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3257] = {
-	.class_hid = BNXT_ULP_CLASS_HID_238b0,
+	[3837] = {
+	.class_hid = BNXT_ULP_CLASS_HID_449b6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 258,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3258] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20440,
+	[3838] = {
+	.class_hid = BNXT_ULP_CLASS_HID_410c6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 259,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3259] = {
-	.class_hid = BNXT_ULP_CLASS_HID_200b4,
+	[3839] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42016,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 259,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3260] = {
-	.class_hid = BNXT_ULP_CLASS_HID_235e4,
+	[3840] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4266a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3261] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25d04,
+	[3841] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45fde,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3262] = {
-	.class_hid = BNXT_ULP_CLASS_HID_228d4,
+	[3842] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44512,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3263] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22508,
+	[3843] = {
+	.class_hid = BNXT_ULP_CLASS_HID_439be,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3264] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25678,
+	[3844] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43ff2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3265] = {
-	.class_hid = BNXT_ULP_CLASS_HID_229d8,
+	[3845] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63682,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3266] = {
-	.class_hid = BNXT_ULP_CLASS_HID_234e8,
+	[3846] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63cc6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3267] = {
-	.class_hid = BNXT_ULP_CLASS_HID_231dc,
+	[3847] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61162,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3268] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2220c,
+	[3848] = {
+	.class_hid = BNXT_ULP_CLASS_HID_616a6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3269] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24dac,
+	[3849] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60c2a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3270] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2597c,
+	[3850] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6326e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3271] = {
-	.class_hid = BNXT_ULP_CLASS_HID_255b0,
+	[3851] = {
+	.class_hid = BNXT_ULP_CLASS_HID_645be,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3272] = {
-	.class_hid = BNXT_ULP_CLASS_HID_246e0,
+	[3852] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64bf2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3273] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23374,
+	[3853] = {
+	.class_hid = BNXT_ULP_CLASS_HID_50082,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3274] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21e04,
+	[3854] = {
+	.class_hid = BNXT_ULP_CLASS_HID_506c6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3275] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21b78,
+	[3855] = {
+	.class_hid = BNXT_ULP_CLASS_HID_55616,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3276] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20fa8,
+	[3856] = {
+	.class_hid = BNXT_ULP_CLASS_HID_55c6a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3277] = {
-	.class_hid = BNXT_ULP_CLASS_HID_257c8,
+	[3857] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5162a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3278] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22298,
+	[3858] = {
+	.class_hid = BNXT_ULP_CLASS_HID_51c6e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3279] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23fcc,
+	[3859] = {
+	.class_hid = BNXT_ULP_CLASS_HID_52fbe,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3280] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2503c,
+	[3860] = {
+	.class_hid = BNXT_ULP_CLASS_HID_555f2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3281] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2239c,
+	[3861] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72c82,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3282] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20eac,
+	[3862] = {
+	.class_hid = BNXT_ULP_CLASS_HID_752c6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3283] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20be0,
+	[3863] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70762,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3284] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23cd0,
+	[3864] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70ca6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 114688,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3285] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24470,
+	[3865] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7222a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3286] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25300,
+	[3866] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7286e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3287] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c74,
+	[3867] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71c8a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3288] = {
-	.class_hid = BNXT_ULP_CLASS_HID_240a4,
+	[3868] = {
+	.class_hid = BNXT_ULP_CLASS_HID_702ce,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 122880,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3289] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23da0,
+	[3869] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5842,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3290] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20970,
+	[3870] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e06,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3291] = {
-	.class_hid = BNXT_ULP_CLASS_HID_205a4,
+	[3871] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d36,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3292] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23694,
+	[3872] = {
+	.class_hid = BNXT_ULP_CLASS_HID_02fa,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4096,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3293] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25e34,
+	[3873] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32e2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3294] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22dc4,
+	[3874] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38a6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3295] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22638,
+	[3875] = {
+	.class_hid = BNXT_ULP_CLASS_HID_528a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3296] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25b68,
+	[3876] = {
+	.class_hid = BNXT_ULP_CLASS_HID_584e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 6144,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3297] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34c8,
+	[3877] = {
+	.class_hid = BNXT_ULP_CLASS_HID_51da,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3298] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a04,
+	[3878] = {
+	.class_hid = BNXT_ULP_CLASS_HID_579e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3299] = {
-	.class_hid = BNXT_ULP_CLASS_HID_09d4,
+	[3879] = {
+	.class_hid = BNXT_ULP_CLASS_HID_128e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3300] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5e98,
+	[3880] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1852,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 12288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3301] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2da8,
+	[3881] = {
+	.class_hid = BNXT_ULP_CLASS_HID_087a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3302] = {
-	.class_hid = BNXT_ULP_CLASS_HID_07a0,
+	[3882] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0e3e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3303] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1370,
+	[3883] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2862,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3304] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2834,
+	[3884] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2e26,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 14336,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3305] = {
-	.class_hid = BNXT_ULP_CLASS_HID_37c4,
+	[3885] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4550e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3306] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0398,
+	[3886] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45ad2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3307] = {
-	.class_hid = BNXT_ULP_CLASS_HID_595c,
+	[3887] = {
+	.class_hid = BNXT_ULP_CLASS_HID_419c2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3308] = {
-	.class_hid = BNXT_ULP_CLASS_HID_246c,
+	[3888] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41f86,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 20480,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3309] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e64,
+	[3889] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40fae,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3310] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48c0,
+	[3890] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43572,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3311] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22f8,
+	[3891] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42f56,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3312] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3188,
+	[3892] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4551a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 2,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 22528,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3313] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24664,
+	[3893] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42ae6,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3314] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29418,
+	[3894] = {
+	.class_hid = BNXT_ULP_CLASS_HID_450aa,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3315] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30118,
+	[3895] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44a8e,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3316] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38a18,
+	[3896] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4151e,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 28672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3317] = {
-	.class_hid = BNXT_ULP_CLASS_HID_255b4,
+	[3897] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40506,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3318] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2deb4,
+	[3898] = {
+	.class_hid = BNXT_ULP_CLASS_HID_40aca,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3319] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34bb4,
+	[3899] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4252e,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3320] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39968,
+	[3900] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42af2,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 30720,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3321] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22e68,
+	[3901] = {
+	.class_hid = BNXT_ULP_CLASS_HID_449d6,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3322] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2db68,
+	[3902] = {
+	.class_hid = BNXT_ULP_CLASS_HID_410a6,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3323] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34468,
+	[3903] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42076,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3324] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3921c,
+	[3904] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4260a,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 16384,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3325] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24318,
+	[3905] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45fbe,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3326] = {
-	.class_hid = BNXT_ULP_CLASS_HID_290cc,
+	[3906] = {
+	.class_hid = BNXT_ULP_CLASS_HID_44572,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3327] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31dcc,
+	[3907] = {
+	.class_hid = BNXT_ULP_CLASS_HID_439de,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3328] = {
-	.class_hid = BNXT_ULP_CLASS_HID_386cc,
+	[3908] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43f92,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 24576,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3329] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20fac,
+	[3909] = {
+	.class_hid = BNXT_ULP_CLASS_HID_636e2,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3330] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b8ac,
+	[3910] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63ca6,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3331] = {
-	.class_hid = BNXT_ULP_CLASS_HID_325ac,
+	[3911] = {
+	.class_hid = BNXT_ULP_CLASS_HID_61102,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3332] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3aeac,
+	[3912] = {
+	.class_hid = BNXT_ULP_CLASS_HID_616c6,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3333] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21afc,
+	[3913] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60c4a,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3334] = {
-	.class_hid = BNXT_ULP_CLASS_HID_287fc,
+	[3914] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6320e,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3335] = {
-	.class_hid = BNXT_ULP_CLASS_HID_330fc,
+	[3915] = {
+	.class_hid = BNXT_ULP_CLASS_HID_645de,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3336] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bdfc,
+	[3916] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64b92,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 57344,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3337] = {
-	.class_hid = BNXT_ULP_CLASS_HID_217b0,
+	[3917] = {
+	.class_hid = BNXT_ULP_CLASS_HID_500e2,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3338] = {
-	.class_hid = BNXT_ULP_CLASS_HID_280b0,
+	[3918] = {
+	.class_hid = BNXT_ULP_CLASS_HID_506a6,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3339] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30db0,
+	[3919] = {
+	.class_hid = BNXT_ULP_CLASS_HID_55676,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3340] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b6b0,
+	[3920] = {
+	.class_hid = BNXT_ULP_CLASS_HID_55c0a,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 81920,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3341] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20860,
+	[3921] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5164a,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3342] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b560,
+	[3922] = {
+	.class_hid = BNXT_ULP_CLASS_HID_51c0e,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3343] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33e60,
+	[3923] = {
+	.class_hid = BNXT_ULP_CLASS_HID_52fde,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3344] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ab60,
+	[3924] = {
+	.class_hid = BNXT_ULP_CLASS_HID_55592,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 90112,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3345] = {
-	.class_hid = BNXT_ULP_CLASS_HID_253c0,
+	[3925] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72ce2,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3346] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dcc0,
+	[3926] = {
+	.class_hid = BNXT_ULP_CLASS_HID_752a6,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 260,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3347] = {
-	.class_hid = BNXT_ULP_CLASS_HID_349c0,
+	[3927] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70702,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 261,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3348] = {
-	.class_hid = BNXT_ULP_CLASS_HID_397f4,
+	[3928] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70cc6,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 262,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3349] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23f10,
+	[3929] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7224a,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 263,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3350] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a810,
+	[3930] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7280e,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 263,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3351] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35510,
+	[3931] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71cea,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 263,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3352] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3de10,
+	[3932] = {
+	.class_hid = BNXT_ULP_CLASS_HID_702ae,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 263,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 122880,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3353] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23bc4,
+	[3933] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23dc0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 263,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -69949,21 +82749,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3354] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a4c4,
+	[3934] = {
+	.class_hid = BNXT_ULP_CLASS_HID_223fc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 263,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -69971,22 +82765,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3355] = {
-	.class_hid = BNXT_ULP_CLASS_HID_351c4,
+	[3935] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2079c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 264,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -69994,22 +82782,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3356] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dac4,
+	[3936] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20d58,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 265,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70017,44 +82799,34 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3357] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22cf4,
+	[3937] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25e54,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3358] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d9f4,
+	[3938] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24410,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70062,21 +82834,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3359] = {
-	.class_hid = BNXT_ULP_CLASS_HID_342f4,
+	[3939] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22830,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70084,21 +82852,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3360] = {
-	.class_hid = BNXT_ULP_CLASS_HID_390a8,
+	[3940] = {
+	.class_hid = BNXT_ULP_CLASS_HID_251ec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70106,22 +82870,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3361] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21908,
+	[3941] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20910,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70129,20 +82889,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3362] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28208,
+	[3942] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20ecc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70150,21 +82906,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3363] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30f08,
+	[3943] = {
+	.class_hid = BNXT_ULP_CLASS_HID_212ec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70172,21 +82924,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3364] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b808,
+	[3944] = {
+	.class_hid = BNXT_ULP_CLASS_HID_218a8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70194,22 +82942,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3365] = {
-	.class_hid = BNXT_ULP_CLASS_HID_243a4,
+	[3945] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22da4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70217,21 +82961,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3366] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29158,
+	[3946] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25360,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32768,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70239,22 +82979,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3367] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31a58,
+	[3947] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23700,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70262,22 +82998,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3368] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38758,
+	[3948] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23d3c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 32832,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70285,23 +83017,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3369] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25c58,
+	[3949] = {
+	.class_hid = BNXT_ULP_CLASS_HID_636f4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70309,22 +83037,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3370] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c958,
+	[3950] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63cb0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70332,23 +83054,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3371] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3170c,
+	[3951] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60050,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70356,23 +83072,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3372] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3800c,
+	[3952] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6060c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70380,24 +83090,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3373] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2123c,
+	[3953] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65b08,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70405,21 +83109,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3374] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29f3c,
+	[3954] = {
+	.class_hid = BNXT_ULP_CLASS_HID_640c4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70427,22 +83127,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3375] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3083c,
+	[3955] = {
+	.class_hid = BNXT_ULP_CLASS_HID_624e4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70450,22 +83146,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3376] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b53c,
+	[3956] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62aa0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70473,23 +83165,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3377] = {
-	.class_hid = BNXT_ULP_CLASS_HID_240a8,
+	[3957] = {
+	.class_hid = BNXT_ULP_CLASS_HID_605c4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70497,17 +83185,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3378] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cda8,
+	[3958] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60b80,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70515,18 +83203,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3379] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31b5c,
+	[3959] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64aec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70534,18 +83222,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3380] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3845c,
+	[3960] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6155c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70553,19 +83241,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3381] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22ff8,
+	[3961] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62658,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70573,18 +83261,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3382] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d8f8,
+	[3962] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62c14,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70592,19 +83280,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3383] = {
-	.class_hid = BNXT_ULP_CLASS_HID_345f8,
+	[3963] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63034,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70612,19 +83300,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3384] = {
-	.class_hid = BNXT_ULP_CLASS_HID_393ac,
+	[3964] = {
+	.class_hid = BNXT_ULP_CLASS_HID_639f0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70632,20 +83320,20 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3385] = {
-	.class_hid = BNXT_ULP_CLASS_HID_228ac,
+	[3965] = {
+	.class_hid = BNXT_ULP_CLASS_HID_353c0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70653,19 +83341,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3386] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d5ac,
+	[3966] = {
+	.class_hid = BNXT_ULP_CLASS_HID_359fc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70673,20 +83358,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3387] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35eac,
+	[3967] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33d9c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70694,20 +83376,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3388] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cbac,
+	[3968] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32358,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70715,21 +83394,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3389] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25d5c,
+	[3969] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31908,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70737,18 +83413,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3390] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c65c,
+	[3970] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31ec4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70756,19 +83431,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3391] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31410,
+	[3971] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35e30,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70776,19 +83450,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3392] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38110,
+	[3972] = {
+	.class_hid = BNXT_ULP_CLASS_HID_347ec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70796,20 +83469,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3393] = {
-	.class_hid = BNXT_ULP_CLASS_HID_209f0,
+	[3973] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33f10,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70817,18 +83489,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3394] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b2f0,
+	[3974] = {
+	.class_hid = BNXT_ULP_CLASS_HID_324cc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70836,19 +83507,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3395] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33ff0,
+	[3975] = {
+	.class_hid = BNXT_ULP_CLASS_HID_308ec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70856,19 +83526,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3396] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a8f0,
+	[3976] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30ea8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70876,20 +83545,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3397] = {
-	.class_hid = BNXT_ULP_CLASS_HID_214c0,
+	[3977] = {
+	.class_hid = BNXT_ULP_CLASS_HID_343a4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70897,19 +83565,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3398] = {
-	.class_hid = BNXT_ULP_CLASS_HID_281c0,
+	[3978] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34960,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70917,20 +83584,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3399] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30ac0,
+	[3979] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32d00,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70938,20 +83604,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3400] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b7c0,
+	[3980] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3533c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70959,21 +83624,20 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3401] = {
-	.class_hid = BNXT_ULP_CLASS_HID_211f4,
+	[3981] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72cf4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -70981,20 +83645,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3402] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29af4,
+	[3982] = {
+	.class_hid = BNXT_ULP_CLASS_HID_752b0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71002,21 +83663,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3403] = {
-	.class_hid = BNXT_ULP_CLASS_HID_307f4,
+	[3983] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73650,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71024,21 +83682,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3404] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b0f4,
+	[3984] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73c0c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71046,22 +83701,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3405] = {
-	.class_hid = BNXT_ULP_CLASS_HID_202a4,
+	[3985] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7123c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71069,19 +83721,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3406] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28fa4,
+	[3986] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71bf8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71089,20 +83740,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3407] = {
-	.class_hid = BNXT_ULP_CLASS_HID_338a4,
+	[3987] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75ae4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71110,20 +83760,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3408] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a5a4,
+	[3988] = {
+	.class_hid = BNXT_ULP_CLASS_HID_740a0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71131,21 +83780,20 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3409] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22a04,
+	[3989] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73bc4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71153,18 +83801,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3410] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d704,
+	[3990] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72180,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71172,19 +83820,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3411] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34004,
+	[3991] = {
+	.class_hid = BNXT_ULP_CLASS_HID_705a0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71192,19 +83840,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3412] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cd04,
+	[3992] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70b5c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71212,20 +83860,20 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3413] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23954,
+	[3993] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75c58,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71233,19 +83881,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3414] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a254,
+	[3994] = {
+	.class_hid = BNXT_ULP_CLASS_HID_74214,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71253,20 +83901,20 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3415] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32f54,
+	[3995] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72634,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71274,20 +83922,20 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3416] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d854,
+	[3996] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72ff0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71295,21 +83943,21 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3417] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23208,
+	[3997] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a6c0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71317,20 +83965,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3418] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bf08,
+	[3998] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2acfc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71338,21 +83982,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3419] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32808,
+	[3999] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b09c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71360,21 +84000,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3420] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d508,
+	[4000] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b658,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71382,22 +84018,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3421] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22738,
+	[4001] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2cb54,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71405,19 +84037,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3422] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d038,
+	[4002] = {
+	.class_hid = BNXT_ULP_CLASS_HID_295c4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71425,20 +84055,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3423] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35d38,
+	[4003] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d530,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71446,20 +84074,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3424] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c638,
+	[4004] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2daec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71467,21 +84093,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3425] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2134c,
+	[4005] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b210,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71489,19 +84113,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3426] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29c4c,
+	[4006] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bbcc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71509,20 +84131,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3427] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3094c,
+	[4007] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29fec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71530,20 +84150,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3428] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b24c,
+	[4008] = {
+	.class_hid = BNXT_ULP_CLASS_HID_285a8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71551,21 +84169,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3429] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25de8,
+	[4009] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d6a4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71573,20 +84189,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3430] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c6e8,
+	[4010] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2dc60,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71594,21 +84208,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3431] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3149c,
+	[4011] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a000,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71616,21 +84228,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3432] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3819c,
+	[4012] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a63c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71638,22 +84248,20 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3433] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2569c,
+	[4013] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a3f4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71661,21 +84269,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3434] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c39c,
+	[4014] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a9b0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71683,22 +84287,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3435] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31150,
+	[4015] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68d50,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71706,22 +84306,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3436] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39a50,
+	[4016] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6b30c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71729,23 +84325,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3437] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24b4c,
+	[4017] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c408,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71753,20 +84345,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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3438] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29900,
+	[4018] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6cdc4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71774,21 +84364,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3439] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30200,
+	[4019] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d1e4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71796,21 +84384,19 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3440] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38f00,
+	[4020] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d7a0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71818,22 +84404,20 @@ 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_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3441] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22f74,
+	[4021] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68ec4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71841,17 +84425,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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3442] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d874,
+	[4022] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6b480,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71859,18 +84444,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3443] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34574,
+	[4023] = {
+	.class_hid = BNXT_ULP_CLASS_HID_698a0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71878,18 +84464,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3444] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39328,
+	[4024] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69e5c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71897,19 +84484,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3445] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23a44,
+	[4025] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d358,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71917,18 +84505,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3446] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a744,
+	[4026] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d914,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71936,19 +84525,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3447] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35044,
+	[4027] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6bd34,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71956,19 +84546,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3448] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dd44,
+	[4028] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a2f0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71976,20 +84567,21 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3449] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23778,
+	[4029] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3dcc0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -71997,19 +84589,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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3450] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a078,
+	[4030] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3c2fc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72017,20 +84607,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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3451] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32d78,
+	[4031] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a69c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72038,20 +84626,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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3452] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d678,
+	[4032] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3ac58,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72059,21 +84645,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3453] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22828,
+	[4033] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38208,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72081,18 +84665,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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3454] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d528,
+	[4034] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38bc4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72100,19 +84684,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3455] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35e28,
+	[4035] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3cb30,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72120,19 +84704,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3456] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cb28,
+	[4036] = {
+	.class_hid = BNXT_ULP_CLASS_HID_395a0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72140,20 +84724,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3457] = {
-	.class_hid = BNXT_ULP_CLASS_HID_214bc,
+	[4037] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a810,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72161,18 +84745,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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3458] = {
-	.class_hid = BNXT_ULP_CLASS_HID_281bc,
+	[4038] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d1cc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72180,19 +84764,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3459] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30abc,
+	[4039] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b5ec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72200,19 +84784,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3460] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b7bc,
+	[4040] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3bba8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72220,20 +84804,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3461] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25ed8,
+	[4041] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39158,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72241,19 +84825,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3462] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cbd8,
+	[4042] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39714,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72261,20 +84845,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3463] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3198c,
+	[4043] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d600,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72282,20 +84866,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3464] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3828c,
+	[4044] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3dc3c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72303,21 +84887,21 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3465] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25b8c,
+	[4045] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d9f4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72325,20 +84909,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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3466] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c48c,
+	[4046] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7dfb0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72346,21 +84928,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3467] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31240,
+	[4047] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a350,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72368,21 +84948,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3468] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39f40,
+	[4048] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a90c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72390,22 +84968,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3469] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21170,
+	[4049] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79f3c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72413,19 +84989,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3470] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29a70,
+	[4050] = {
+	.class_hid = BNXT_ULP_CLASS_HID_784f8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72433,20 +85009,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3471] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30770,
+	[4051] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c7e4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72454,20 +85030,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3472] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b070,
+	[4052] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7cda0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72475,21 +85051,21 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3473] = {
-	.class_hid = BNXT_ULP_CLASS_HID_238d0,
+	[4053] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a4c4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72497,18 +85073,19 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3474] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a5d0,
+	[4054] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7aa80,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 266,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72516,19 +85093,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3475] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32ed0,
+	[4055] = {
+	.class_hid = BNXT_ULP_CLASS_HID_78ea0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 267,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72536,19 +85114,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3476] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dbd0,
+	[4056] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b45c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 268,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72556,20 +85135,21 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3477] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20420,
+	[4057] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c958,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 269,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72577,19 +85157,20 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3478] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b120,
+	[4058] = {
+	.class_hid = BNXT_ULP_CLASS_HID_793c8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 269,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72597,20 +85178,21 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3479] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33a20,
+	[4059] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d334,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 269,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72618,20 +85200,21 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3480] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a720,
+	[4060] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d8f0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 269,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -72639,2814 +85222,2735 @@ 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_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3481] = {
-	.class_hid = BNXT_ULP_CLASS_HID_200d4,
+	[4061] = {
+	.class_hid = BNXT_ULP_CLASS_HID_9ab8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 269,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3482] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28dd4,
+	[4062] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8084,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 269,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3483] = {
-	.class_hid = BNXT_ULP_CLASS_HID_336d4,
+	[4063] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c390,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 270,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3484] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a3d4,
+	[4064] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c9dc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 271,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3485] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23584,
+	[4065] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bf2c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3486] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2be84,
+	[4066] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a568,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3487] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32b84,
+	[4067] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8948,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3488] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d484,
+	[4068] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8e94,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3489] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25d64,
+	[4069] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4978c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3490] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c664,
+	[4070] = {
+	.class_hid = BNXT_ULP_CLASS_HID_49dc8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3491] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31418,
+	[4071] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4dce4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3492] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38118,
+	[4072] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c220,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3493] = {
-	.class_hid = BNXT_ULP_CLASS_HID_228b4,
+	[4073] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b870,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3494] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d5b4,
+	[4074] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a1bc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3495] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35eb4,
+	[4075] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4859c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3496] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cbb4,
+	[4076] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48bd8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3497] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22568,
+	[4077] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b0b8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3498] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ae68,
+	[4078] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b684,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3499] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35b68,
+	[4079] = {
+	.class_hid = BNXT_ULP_CLASS_HID_19ae4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3500] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c468,
+	[4080] = {
+	.class_hid = BNXT_ULP_CLASS_HID_18020,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3501] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25618,
+	[4081] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d52c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3502] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c318,
+	[4082] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1db68,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3503] = {
-	.class_hid = BNXT_ULP_CLASS_HID_310cc,
+	[4083] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1bf48,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3504] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39dcc,
+	[4084] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a494,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3505] = {
-	.class_hid = BNXT_ULP_CLASS_HID_229b8,
+	[4085] = {
+	.class_hid = BNXT_ULP_CLASS_HID_58d8c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3506] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d2b8,
+	[4086] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b3c8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3507] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35fb8,
+	[4087] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59728,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3508] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c8b8,
+	[4088] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59d74,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3509] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23488,
+	[4089] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ae70,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3510] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a188,
+	[4090] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d7bc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3511] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32a88,
+	[4091] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bb9c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3512] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d788,
+	[4092] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a1d8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3513] = {
-	.class_hid = BNXT_ULP_CLASS_HID_231bc,
+	[4093] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c138,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3514] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2babc,
+	[4094] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c704,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3515] = {
-	.class_hid = BNXT_ULP_CLASS_HID_327bc,
+	[4095] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c610,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3516] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d0bc,
+	[4096] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d0a0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3517] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2226c,
+	[4097] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e5ac,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3518] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2af6c,
+	[4098] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ebe8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3519] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3586c,
+	[4099] = {
+	.class_hid = BNXT_ULP_CLASS_HID_cfc8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3520] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c56c,
+	[4100] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f514,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3521] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24dcc,
+	[4101] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4da0c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3522] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29b80,
+	[4102] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c048,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3523] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30480,
+	[4103] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c364,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3524] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b180,
+	[4104] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c8a0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3525] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2591c,
+	[4105] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fef0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3526] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c21c,
+	[4106] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e43c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3527] = {
-	.class_hid = BNXT_ULP_CLASS_HID_313d0,
+	[4107] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c81c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3528] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39cd0,
+	[4108] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ce58,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3529] = {
-	.class_hid = BNXT_ULP_CLASS_HID_255d0,
+	[4109] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f738,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3530] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ded0,
+	[4110] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fd04,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3531] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34bd0,
+	[4111] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c164,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3532] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39984,
+	[4112] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c6a0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3533] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24680,
+	[4113] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1dbac,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3534] = {
-	.class_hid = BNXT_ULP_CLASS_HID_294b4,
+	[4114] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c1e8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3535] = {
-	.class_hid = BNXT_ULP_CLASS_HID_301b4,
+	[4115] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e5c8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3536] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38ab4,
+	[4116] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1eb14,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3537] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23314,
+	[4117] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f00c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3538] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bc14,
+	[4118] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f648,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3539] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32914,
+	[4119] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5dda8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3540] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d214,
+	[4120] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c3f4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3541] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21e64,
+	[4121] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d4f0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3542] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28b64,
+	[4122] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5da3c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3543] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33464,
+	[4123] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5fe1c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3544] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a164,
+	[4124] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e458,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3545] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21b18,
+	[4125] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bc78,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3546] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28418,
+	[4126] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a244,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3547] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33118,
+	[4127] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e550,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3548] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ba18,
+	[4128] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ea9c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3549] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20fc8,
+	[4129] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a0ec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3550] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b8c8,
+	[4130] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a628,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3551] = {
-	.class_hid = BNXT_ULP_CLASS_HID_325c8,
+	[4131] = {
+	.class_hid = BNXT_ULP_CLASS_HID_aa08,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3552] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3aec8,
+	[4132] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b054,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3553] = {
-	.class_hid = BNXT_ULP_CLASS_HID_257a8,
+	[4133] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b94c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3554] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c0a8,
+	[4134] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4be88,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3555] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34da8,
+	[4135] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e1a4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3556] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39b5c,
+	[4136] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e7e0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3557] = {
-	.class_hid = BNXT_ULP_CLASS_HID_222f8,
+	[4137] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4bd30,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3558] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2aff8,
+	[4138] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a37c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3559] = {
-	.class_hid = BNXT_ULP_CLASS_HID_358f8,
+	[4139] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a75c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3560] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c5f8,
+	[4140] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ac98,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3561] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23fac,
+	[4141] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b278,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3562] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a8ac,
+	[4142] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b844,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3563] = {
-	.class_hid = BNXT_ULP_CLASS_HID_355ac,
+	[4143] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1bfa4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3564] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3deac,
+	[4144] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a5e0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3565] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2505c,
+	[4145] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f6ec,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3566] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dd5c,
+	[4146] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fc28,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3567] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3465c,
+	[4147] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a008,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3568] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39410,
+	[4148] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a654,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3569] = {
-	.class_hid = BNXT_ULP_CLASS_HID_223fc,
+	[4149] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5af4c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3570] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2acfc,
+	[4150] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b488,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3571] = {
-	.class_hid = BNXT_ULP_CLASS_HID_359fc,
+	[4151] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b8e8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3572] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c2fc,
+	[4152] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5be34,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3573] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20ecc,
+	[4153] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f330,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3574] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bbcc,
+	[4154] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f97c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720896,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3575] = {
-	.class_hid = BNXT_ULP_CLASS_HID_324cc,
+	[4155] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bd5c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3576] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d1cc,
+	[4156] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a298,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 720960,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3577] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20b80,
+	[4157] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e2f8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3578] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b480,
+	[4158] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e8c4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3579] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32180,
+	[4159] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ebd0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3580] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3aa80,
+	[4160] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f260,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3581] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23cb0,
+	[4161] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e76c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3582] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a9b0,
+	[4162] = {
+	.class_hid = BNXT_ULP_CLASS_HID_eca8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3583] = {
-	.class_hid = BNXT_ULP_CLASS_HID_352b0,
+	[4163] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f088,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3584] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dfb0,
+	[4164] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f6d4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3585] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24410,
+	[4165] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ffcc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3586] = {
-	.class_hid = BNXT_ULP_CLASS_HID_295c4,
+	[4166] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e508,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3587] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31ec4,
+	[4167] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e424,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3588] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38bc4,
+	[4168] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ea60,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3589] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25360,
+	[4169] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e3b0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3590] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dc60,
+	[4170] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e9fc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917504,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3591] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34960,
+	[4171] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4eddc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3592] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39714,
+	[4172] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f318,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 917568,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3593] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c14,
+	[4173] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f8f8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3594] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d914,
+	[4174] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fec4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3595] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34214,
+	[4175] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e224,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3596] = {
-	.class_hid = BNXT_ULP_CLASS_HID_393c8,
+	[4176] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e860,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3597] = {
-	.class_hid = BNXT_ULP_CLASS_HID_240c4,
+	[4177] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fd6c,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3598] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cdc4,
+	[4178] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e2a8,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3599] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31bf8,
+	[4179] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e688,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3600] = {
-	.class_hid = BNXT_ULP_CLASS_HID_384f8,
+	[4180] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ecd4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3601] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23dc0,
+	[4181] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f5cc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3602] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a6c0,
+	[4182] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5fb08,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3603] = {
-	.class_hid = BNXT_ULP_CLASS_HID_353c0,
+	[4183] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ff68,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3604] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dcc0,
+	[4184] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e4b4,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3605] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20910,
+	[4185] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f9b0,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3606] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b210,
+	[4186] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5fffc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983040,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3607] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33f10,
+	[4187] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e3dc,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3608] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a810,
+	[4188] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e918,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 983104,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3609] = {
-	.class_hid = BNXT_ULP_CLASS_HID_205c4,
+	[4189] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23de0,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3610] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28ec4,
+	[4190] = {
+	.class_hid = BNXT_ULP_CLASS_HID_223dc,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3611] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33bc4,
+	[4191] = {
+	.class_hid = BNXT_ULP_CLASS_HID_207bc,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3612] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a4c4,
+	[4192] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20d78,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3613] = {
-	.class_hid = BNXT_ULP_CLASS_HID_236f4,
+	[4193] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25e74,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3614] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a3f4,
+	[4194] = {
+	.class_hid = BNXT_ULP_CLASS_HID_24430,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3615] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32cf4,
+	[4195] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22810,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3616] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d9f4,
+	[4196] = {
+	.class_hid = BNXT_ULP_CLASS_HID_251cc,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3617] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25e54,
+	[4197] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20930,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3618] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cb54,
+	[4198] = {
+	.class_hid = BNXT_ULP_CLASS_HID_20eec,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3619] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31908,
+	[4199] = {
+	.class_hid = BNXT_ULP_CLASS_HID_212cc,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3620] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38208,
+	[4200] = {
+	.class_hid = BNXT_ULP_CLASS_HID_21888,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3621] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22da4,
+	[4201] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22d84,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
@@ -75454,155 +87958,147 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3622] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d6a4,
+	[4202] = {
+	.class_hid = BNXT_ULP_CLASS_HID_25340,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32768,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3623] = {
-	.class_hid = BNXT_ULP_CLASS_HID_343a4,
+	[4203] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23720,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3624] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39158,
+	[4204] = {
+	.class_hid = BNXT_ULP_CLASS_HID_23d1c,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 32832,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3625] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22658,
+	[4205] = {
+	.class_hid = BNXT_ULP_CLASS_HID_636d4,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3626] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d358,
+	[4206] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63c90,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3627] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35c58,
+	[4207] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60070,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3628] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c958,
+	[4208] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6062c,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3629] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25b08,
+	[4209] = {
+	.class_hid = BNXT_ULP_CLASS_HID_65b28,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
@@ -75610,374 +88106,374 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3630] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c408,
+	[4210] = {
+	.class_hid = BNXT_ULP_CLASS_HID_640e4,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 49152,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3631] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3123c,
+	[4211] = {
+	.class_hid = BNXT_ULP_CLASS_HID_624c4,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3632] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39f3c,
+	[4212] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62a80,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
+	.flow_sig_id = 49216,
 	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3633] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34a8,
+	[4213] = {
+	.class_hid = BNXT_ULP_CLASS_HID_605e4,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3634] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a64,
+	[4214] = {
+	.class_hid = BNXT_ULP_CLASS_HID_60ba0,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3635] = {
-	.class_hid = BNXT_ULP_CLASS_HID_09b4,
+	[4215] = {
+	.class_hid = BNXT_ULP_CLASS_HID_64acc,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3636] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ef8,
+	[4216] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6157c,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3637] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dc8,
+	[4217] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62678,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3638] = {
-	.class_hid = BNXT_ULP_CLASS_HID_07c0,
+	[4218] = {
+	.class_hid = BNXT_ULP_CLASS_HID_62c34,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 49152,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3639] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1310,
+	[4219] = {
+	.class_hid = BNXT_ULP_CLASS_HID_63014,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3640] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2854,
+	[4220] = {
+	.class_hid = BNXT_ULP_CLASS_HID_639d0,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 49216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3641] = {
-	.class_hid = BNXT_ULP_CLASS_HID_37a4,
+	[4221] = {
+	.class_hid = BNXT_ULP_CLASS_HID_353e0,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3642] = {
-	.class_hid = BNXT_ULP_CLASS_HID_03f8,
+	[4222] = {
+	.class_hid = BNXT_ULP_CLASS_HID_359dc,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3643] = {
-	.class_hid = BNXT_ULP_CLASS_HID_593c,
+	[4223] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33dbc,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3644] = {
-	.class_hid = BNXT_ULP_CLASS_HID_240c,
+	[4224] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32378,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3645] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e04,
+	[4225] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31928,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3646] = {
-	.class_hid = BNXT_ULP_CLASS_HID_48a0,
+	[4226] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31ee4,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3647] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2298,
+	[4227] = {
+	.class_hid = BNXT_ULP_CLASS_HID_35e10,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3648] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31e8,
+	[4228] = {
+	.class_hid = BNXT_ULP_CLASS_HID_347cc,
 	.class_tid = 2,
 	.hdr_sig_id = 10,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 2,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_TCP |
+		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3649] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24644,
+	[4229] = {
+	.class_hid = BNXT_ULP_CLASS_HID_33f30,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -75985,18 +88481,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3650] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29438,
+	[4230] = {
+	.class_hid = BNXT_ULP_CLASS_HID_324ec,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76004,19 +88499,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3651] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30138,
+	[4231] = {
+	.class_hid = BNXT_ULP_CLASS_HID_308cc,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76024,19 +88518,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3652] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38a38,
+	[4232] = {
+	.class_hid = BNXT_ULP_CLASS_HID_30e88,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76044,20 +88537,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3653] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25594,
+	[4233] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34384,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76065,19 +88557,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3654] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2de94,
+	[4234] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34940,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98304,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76085,20 +88576,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3655] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34b94,
+	[4235] = {
+	.class_hid = BNXT_ULP_CLASS_HID_32d20,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76106,20 +88596,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3656] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39948,
+	[4236] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3531c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 98368,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76127,21 +88616,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3657] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22e48,
+	[4237] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72cd4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76149,20 +88637,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3658] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2db48,
+	[4238] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75290,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76170,21 +88655,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3659] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34448,
+	[4239] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73670,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76192,21 +88674,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3660] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3923c,
+	[4240] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73c2c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76214,22 +88693,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3661] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24338,
+	[4241] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7121c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76237,19 +88713,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3662] = {
-	.class_hid = BNXT_ULP_CLASS_HID_290ec,
+	[4242] = {
+	.class_hid = BNXT_ULP_CLASS_HID_71bd8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76257,20 +88732,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3663] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31dec,
+	[4243] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75ac4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76278,20 +88752,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3664] = {
-	.class_hid = BNXT_ULP_CLASS_HID_386ec,
+	[4244] = {
+	.class_hid = BNXT_ULP_CLASS_HID_74080,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76299,21 +88772,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3665] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20f8c,
+	[4245] = {
+	.class_hid = BNXT_ULP_CLASS_HID_73be4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76321,19 +88793,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3666] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b88c,
+	[4246] = {
+	.class_hid = BNXT_ULP_CLASS_HID_721a0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76341,20 +88812,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3667] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3258c,
+	[4247] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70580,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76362,20 +88832,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3668] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ae8c,
+	[4248] = {
+	.class_hid = BNXT_ULP_CLASS_HID_70b7c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76383,21 +88852,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3669] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21adc,
+	[4249] = {
+	.class_hid = BNXT_ULP_CLASS_HID_75c78,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76405,20 +88873,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3670] = {
-	.class_hid = BNXT_ULP_CLASS_HID_287dc,
+	[4250] = {
+	.class_hid = BNXT_ULP_CLASS_HID_74234,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114688,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76426,21 +88893,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3671] = {
-	.class_hid = BNXT_ULP_CLASS_HID_330dc,
+	[4251] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72614,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76448,21 +88914,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3672] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3bddc,
+	[4252] = {
+	.class_hid = BNXT_ULP_CLASS_HID_72fd0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 114752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76470,22 +88935,21 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3673] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21790,
+	[4253] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a6e0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76493,21 +88957,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3674] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28090,
+	[4254] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2acdc,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76515,22 +88974,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3675] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30d90,
+	[4255] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b0bc,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76538,22 +88992,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3676] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b690,
+	[4256] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b678,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76561,23 +89010,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3677] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20840,
+	[4257] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2cb74,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76585,20 +89029,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3678] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b540,
+	[4258] = {
+	.class_hid = BNXT_ULP_CLASS_HID_295e4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76606,21 +89047,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3679] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33e40,
+	[4259] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d510,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76628,21 +89066,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3680] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ab40,
+	[4260] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2dacc,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76650,22 +89085,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3681] = {
-	.class_hid = BNXT_ULP_CLASS_HID_253e0,
+	[4261] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2b230,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76673,19 +89105,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3682] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dce0,
+	[4262] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2bbec,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 272,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76693,20 +89123,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3683] = {
-	.class_hid = BNXT_ULP_CLASS_HID_349e0,
+	[4263] = {
+	.class_hid = BNXT_ULP_CLASS_HID_29fcc,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 273,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76714,20 +89142,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3684] = {
-	.class_hid = BNXT_ULP_CLASS_HID_397d4,
+	[4264] = {
+	.class_hid = BNXT_ULP_CLASS_HID_28588,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 274,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76735,21 +89161,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3685] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23f30,
+	[4265] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2d684,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 275,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76757,20 +89181,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3686] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a830,
+	[4266] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2dc40,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 275,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163840,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76778,21 +89200,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3687] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35530,
+	[4267] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a020,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 275,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76800,21 +89220,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3688] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3de30,
+	[4268] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2a61c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 275,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 163904,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76822,22 +89240,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3689] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23be4,
+	[4269] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a3d4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 275,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76845,21 +89261,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3690] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a4e4,
+	[4270] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a990,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 275,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76867,22 +89279,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3691] = {
-	.class_hid = BNXT_ULP_CLASS_HID_351e4,
+	[4271] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68d70,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 276,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76890,22 +89298,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3692] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dae4,
+	[4272] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6b32c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 277,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76913,23 +89317,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3693] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22cd4,
+	[4273] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6c428,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76937,20 +89337,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3694] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d9d4,
+	[4274] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6cde4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76958,21 +89356,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3695] = {
-	.class_hid = BNXT_ULP_CLASS_HID_342d4,
+	[4275] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d1c4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -76980,21 +89376,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3696] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39088,
+	[4276] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d780,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77002,22 +89396,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3697] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21928,
+	[4277] = {
+	.class_hid = BNXT_ULP_CLASS_HID_68ee4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77025,20 +89417,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3698] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28228,
+	[4278] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6b4a0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77046,21 +89436,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3699] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30f28,
+	[4279] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69880,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77068,21 +89456,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3700] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b828,
+	[4280] = {
+	.class_hid = BNXT_ULP_CLASS_HID_69e7c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77090,22 +89476,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3701] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24384,
+	[4281] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d378,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77113,21 +89497,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3702] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29178,
+	[4282] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6d934,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180224,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77135,22 +89517,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3703] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31a78,
+	[4283] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6bd14,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77158,22 +89538,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3704] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38778,
+	[4284] = {
+	.class_hid = BNXT_ULP_CLASS_HID_6a2d0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 180288,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77181,23 +89559,21 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3705] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25c78,
+	[4285] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3dce0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77205,22 +89581,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3706] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c978,
+	[4286] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3c2dc,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77228,23 +89599,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3707] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3172c,
+	[4287] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a6bc,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77252,23 +89618,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3708] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3802c,
+	[4288] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3ac78,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77276,24 +89637,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3709] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2121c,
+	[4289] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38228,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77301,21 +89657,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3710] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29f1c,
+	[4290] = {
+	.class_hid = BNXT_ULP_CLASS_HID_38be4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77323,22 +89676,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3711] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3081c,
+	[4291] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3cb10,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77346,22 +89696,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3712] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b51c,
+	[4292] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39580,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77369,23 +89716,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3713] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24088,
+	[4293] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a830,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77393,17 +89737,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3714] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cd88,
+	[4294] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d1ec,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77411,18 +89756,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3715] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31b7c,
+	[4295] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3b5cc,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77430,18 +89776,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3716] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3847c,
+	[4296] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3bb88,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77449,19 +89796,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3717] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22fd8,
+	[4297] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39178,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77469,18 +89817,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3718] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d8d8,
+	[4298] = {
+	.class_hid = BNXT_ULP_CLASS_HID_39734,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229376,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77488,19 +89837,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3719] = {
-	.class_hid = BNXT_ULP_CLASS_HID_345d8,
+	[4299] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3d620,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77508,19 +89858,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3720] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3938c,
+	[4300] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3dc1c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 229440,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77528,20 +89879,21 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3721] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2288c,
+	[4301] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d9d4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77549,19 +89901,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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3722] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d58c,
+	[4302] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7df90,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77569,20 +89920,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3723] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35e8c,
+	[4303] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a370,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77590,20 +89940,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3724] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cb8c,
+	[4304] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a92c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77611,40 +89960,40 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3725] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25d7c,
+	[4305] = {
+	.class_hid = BNXT_ULP_CLASS_HID_79f1c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+	.field_sig = { .bits =
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3726] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c67c,
+	[4306] = {
+	.class_hid = BNXT_ULP_CLASS_HID_784d8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77652,19 +90001,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3727] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31430,
+	[4307] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c7c4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77672,19 +90022,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3728] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38130,
+	[4308] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7cd80,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77692,20 +90043,21 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3729] = {
-	.class_hid = BNXT_ULP_CLASS_HID_209d0,
+	[4309] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7a4e4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77713,18 +90065,19 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3730] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b2d0,
+	[4310] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7aaa0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77732,19 +90085,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3731] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33fd0,
+	[4311] = {
+	.class_hid = BNXT_ULP_CLASS_HID_78e80,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77752,19 +90106,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3732] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a8d0,
+	[4312] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7b47c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77772,20 +90127,21 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3733] = {
-	.class_hid = BNXT_ULP_CLASS_HID_214e0,
+	[4313] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7c978,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77793,19 +90149,20 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3734] = {
-	.class_hid = BNXT_ULP_CLASS_HID_281e0,
+	[4314] = {
+	.class_hid = BNXT_ULP_CLASS_HID_793e8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245760,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77813,20 +90170,21 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3735] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30ae0,
+	[4315] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d314,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77834,20 +90192,21 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3736] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b7e0,
+	[4316] = {
+	.class_hid = BNXT_ULP_CLASS_HID_7d8d0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 245824,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -77855,4417 +90214,4102 @@ 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_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3737] = {
-	.class_hid = BNXT_ULP_CLASS_HID_211d4,
+	[4317] = {
+	.class_hid = BNXT_ULP_CLASS_HID_9ad8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3738] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29ad4,
+	[4318] = {
+	.class_hid = BNXT_ULP_CLASS_HID_80e4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3739] = {
-	.class_hid = BNXT_ULP_CLASS_HID_307d4,
+	[4319] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c3f0,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3740] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b0d4,
+	[4320] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c9bc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3741] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20284,
+	[4321] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bf4c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3742] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28f84,
+	[4322] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a508,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3743] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33884,
+	[4323] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8928,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3744] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a584,
+	[4324] = {
+	.class_hid = BNXT_ULP_CLASS_HID_8ef4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3745] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22a24,
+	[4325] = {
+	.class_hid = BNXT_ULP_CLASS_HID_497ec,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3746] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d724,
+	[4326] = {
+	.class_hid = BNXT_ULP_CLASS_HID_49da8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3747] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34024,
+	[4327] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4dc84,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3748] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cd24,
+	[4328] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c240,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3749] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23974,
+	[4329] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b810,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3750] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a274,
+	[4330] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a1dc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131072,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3751] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32f74,
+	[4331] = {
+	.class_hid = BNXT_ULP_CLASS_HID_485fc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3752] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d874,
+	[4332] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48bb8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 131136,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3753] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23228,
+	[4333] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b0d8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3754] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bf28,
+	[4334] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b6e4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3755] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32828,
+	[4335] = {
+	.class_hid = BNXT_ULP_CLASS_HID_19a84,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3756] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d528,
+	[4336] = {
+	.class_hid = BNXT_ULP_CLASS_HID_18040,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3757] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22718,
+	[4337] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1d54c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3758] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d018,
+	[4338] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1db08,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3759] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35d18,
+	[4339] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1bf28,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3760] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c618,
+	[4340] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a4f4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3761] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2136c,
+	[4341] = {
+	.class_hid = BNXT_ULP_CLASS_HID_58dec,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3762] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29c6c,
+	[4342] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b3a8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3763] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3096c,
+	[4343] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59748,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3764] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b26c,
+	[4344] = {
+	.class_hid = BNXT_ULP_CLASS_HID_59d14,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3765] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25dc8,
+	[4345] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ae10,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3766] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c6c8,
+	[4346] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d7dc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196608,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3767] = {
-	.class_hid = BNXT_ULP_CLASS_HID_314bc,
+	[4347] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bbfc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3768] = {
-	.class_hid = BNXT_ULP_CLASS_HID_381bc,
+	[4348] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a1b8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 196672,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3769] = {
-	.class_hid = BNXT_ULP_CLASS_HID_256bc,
+	[4349] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c158,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3770] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c3bc,
+	[4350] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c764,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3771] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31170,
+	[4351] = {
+	.class_hid = BNXT_ULP_CLASS_HID_c670,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3772] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39a70,
+	[4352] = {
+	.class_hid = BNXT_ULP_CLASS_HID_d0c0,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3773] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24b6c,
+	[4353] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e5cc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3774] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29920,
+	[4354] = {
+	.class_hid = BNXT_ULP_CLASS_HID_eb88,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3775] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30220,
+	[4355] = {
+	.class_hid = BNXT_ULP_CLASS_HID_cfa8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3776] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38f20,
+	[4356] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f574,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3777] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22f54,
+	[4357] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4da6c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3778] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d854,
+	[4358] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c028,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3779] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34554,
+	[4359] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c304,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3780] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39308,
+	[4360] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c8c0,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3781] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23a64,
+	[4361] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4fe90,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3782] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a764,
+	[4362] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e45c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393216,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3783] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35064,
+	[4363] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4c87c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3784] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dd64,
+	[4364] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ce38,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 393280,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3785] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23758,
+	[4365] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f758,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3786] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a058,
+	[4366] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fd64,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3787] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32d58,
+	[4367] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c104,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3788] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d658,
+	[4368] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c6c0,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3789] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22808,
+	[4369] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1dbcc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3790] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d508,
+	[4370] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1c188,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3791] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35e08,
+	[4371] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e5a8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3792] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cb08,
+	[4372] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1eb74,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3793] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2149c,
+	[4373] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f06c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3794] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2819c,
+	[4374] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f628,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3795] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30a9c,
+	[4375] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ddc8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3796] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b79c,
+	[4376] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5c394,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3797] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25ef8,
+	[4377] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5d490,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3798] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cbf8,
+	[4378] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5da5c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458752,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3799] = {
-	.class_hid = BNXT_ULP_CLASS_HID_319ac,
+	[4379] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5fe7c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3800] = {
-	.class_hid = BNXT_ULP_CLASS_HID_382ac,
+	[4380] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e438,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 458816,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3801] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25bac,
+	[4381] = {
+	.class_hid = BNXT_ULP_CLASS_HID_bc18,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3802] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c4ac,
+	[4382] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a224,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3803] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31260,
+	[4383] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e530,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3804] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39f60,
+	[4384] = {
+	.class_hid = BNXT_ULP_CLASS_HID_eafc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3805] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21150,
+	[4385] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a08c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3806] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29a50,
+	[4386] = {
+	.class_hid = BNXT_ULP_CLASS_HID_a648,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3807] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30750,
+	[4387] = {
+	.class_hid = BNXT_ULP_CLASS_HID_aa68,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3808] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b050,
+	[4388] = {
+	.class_hid = BNXT_ULP_CLASS_HID_b034,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3809] = {
-	.class_hid = BNXT_ULP_CLASS_HID_238f0,
+	[4389] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4b92c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3810] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a5f0,
+	[4390] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4bee8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 278,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3811] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32ef0,
+	[4391] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e1c4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 279,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3812] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dbf0,
+	[4392] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e780,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 280,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3813] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20400,
+	[4393] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4bd50,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 281,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3814] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b100,
+	[4394] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a31c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 281,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655360,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3815] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33a00,
+	[4395] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a73c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 281,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3816] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a700,
+	[4396] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4acf8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 281,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 655424,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3817] = {
-	.class_hid = BNXT_ULP_CLASS_HID_200f4,
+	[4397] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b218,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 281,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3818] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28df4,
+	[4398] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1b824,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 281,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3819] = {
-	.class_hid = BNXT_ULP_CLASS_HID_336f4,
+	[4399] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1bfc4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 282,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3820] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a3f4,
+	[4400] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a580,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 283,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3821] = {
-	.class_hid = BNXT_ULP_CLASS_HID_235a4,
+	[4401] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f68c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3822] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bea4,
+	[4402] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fc48,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3823] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32ba4,
+	[4403] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a068,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3824] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d4a4,
+	[4404] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1a634,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3825] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25d44,
+	[4405] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5af2c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3826] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c644,
+	[4406] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b4e8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3827] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31438,
+	[4407] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5b888,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3828] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38138,
+	[4408] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5be54,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3829] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22894,
+	[4409] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f350,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3830] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d594,
+	[4410] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f91c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720896,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3831] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35e94,
+	[4411] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5bd3c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3832] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3cb94,
+	[4412] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a2f8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 720960,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3833] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22548,
+	[4413] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e298,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3834] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ae48,
+	[4414] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e8a4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3835] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35b48,
+	[4415] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ebb0,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3836] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c448,
+	[4416] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f200,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3837] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25638,
+	[4417] = {
+	.class_hid = BNXT_ULP_CLASS_HID_e70c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3838] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c338,
+	[4418] = {
+	.class_hid = BNXT_ULP_CLASS_HID_ecc8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3839] = {
-	.class_hid = BNXT_ULP_CLASS_HID_310ec,
+	[4419] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f0e8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3840] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39dec,
+	[4420] = {
+	.class_hid = BNXT_ULP_CLASS_HID_f6b4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3841] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22998,
+	[4421] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ffac,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3842] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d298,
+	[4422] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e568,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3843] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35f98,
+	[4423] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e444,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3844] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c898,
+	[4424] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4ea00,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3845] = {
-	.class_hid = BNXT_ULP_CLASS_HID_234a8,
+	[4425] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e3d0,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3846] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a1a8,
+	[4426] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4e99c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917504,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3847] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32aa8,
+	[4427] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4edbc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3848] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d7a8,
+	[4428] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4f378,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 917568,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3849] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2319c,
+	[4429] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1f898,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3850] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2ba9c,
+	[4430] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fea4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3851] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3279c,
+	[4431] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e244,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3852] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d09c,
+	[4432] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e800,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3853] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2224c,
+	[4433] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1fd0c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3854] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2af4c,
+	[4434] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e2c8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3855] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3584c,
+	[4435] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e6e8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3856] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c54c,
+	[4436] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1ecb4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3857] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24dec,
+	[4437] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f5ac,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3858] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29ba0,
+	[4438] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5fb68,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3859] = {
-	.class_hid = BNXT_ULP_CLASS_HID_304a0,
+	[4439] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ff08,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3860] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3b1a0,
+	[4440] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e4d4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3861] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2593c,
+	[4441] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5f9d0,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3862] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c23c,
+	[4442] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ff9c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983040,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3863] = {
-	.class_hid = BNXT_ULP_CLASS_HID_313f0,
+	[4443] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e3bc,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3864] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39cf0,
+	[4444] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e978,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.flow_sig_id = 983104,
+	.flow_pattern_id = 1,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
 		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3865] = {
-	.class_hid = BNXT_ULP_CLASS_HID_255f0,
+	[4445] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34f6,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3866] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2def0,
+	[4446] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a3a,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3867] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34bf0,
+	[4447] = {
+	.class_hid = BNXT_ULP_CLASS_HID_541e,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3868] = {
-	.class_hid = BNXT_ULP_CLASS_HID_399a4,
+	[4448] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a22,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 0,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3869] = {
-	.class_hid = BNXT_ULP_CLASS_HID_246a0,
+	[4449] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34fe,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3870] = {
-	.class_hid = BNXT_ULP_CLASS_HID_29494,
+	[4450] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a32,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3871] = {
-	.class_hid = BNXT_ULP_CLASS_HID_30194,
+	[4451] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a42,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3872] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38a94,
+	[4452] = {
+	.class_hid = BNXT_ULP_CLASS_HID_14d2,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 1,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_1_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3873] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23334,
+	[4453] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34c8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3874] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bc34,
+	[4454] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a04,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3875] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32934,
+	[4455] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e64,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3876] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d234,
+	[4456] = {
+	.class_hid = BNXT_ULP_CLASS_HID_07a0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3877] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21e44,
+	[4457] = {
+	.class_hid = BNXT_ULP_CLASS_HID_595c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3878] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28b44,
+	[4458] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e98,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3879] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33444,
+	[4459] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22f8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3880] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a144,
+	[4460] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2834,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3881] = {
-	.class_hid = BNXT_ULP_CLASS_HID_21b38,
+	[4461] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0398,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3882] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28438,
+	[4462] = {
+	.class_hid = BNXT_ULP_CLASS_HID_09d4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3883] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33138,
+	[4463] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48c0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3884] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3ba38,
+	[4464] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1370,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3885] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20fe8,
+	[4465] = {
+	.class_hid = BNXT_ULP_CLASS_HID_246c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3886] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b8e8,
+	[4466] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2da8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3887] = {
-	.class_hid = BNXT_ULP_CLASS_HID_325e8,
+	[4467] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3188,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3888] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3aee8,
+	[4468] = {
+	.class_hid = BNXT_ULP_CLASS_HID_37c4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 2,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3889] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25788,
+	[4469] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34f0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3890] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c088,
+	[4470] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a3c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3891] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34d88,
+	[4471] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e5c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3892] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39b7c,
+	[4472] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0798,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3893] = {
-	.class_hid = BNXT_ULP_CLASS_HID_222d8,
+	[4473] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5964,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3894] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2afd8,
+	[4474] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ea0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3895] = {
-	.class_hid = BNXT_ULP_CLASS_HID_358d8,
+	[4475] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22c0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3896] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c5d8,
+	[4476] = {
+	.class_hid = BNXT_ULP_CLASS_HID_280c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3897] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23f8c,
+	[4477] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43104,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3898] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a88c,
+	[4478] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43740,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3899] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3558c,
+	[4479] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41b60,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3900] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3de8c,
+	[4480] = {
+	.class_hid = BNXT_ULP_CLASS_HID_400ac,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3901] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2507c,
+	[4481] = {
+	.class_hid = BNXT_ULP_CLASS_HID_455a8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3902] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dd7c,
+	[4482] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45bf4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3903] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3467c,
+	[4483] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43f14,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3904] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39430,
+	[4484] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42550,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 0,
+	.hdr_sig_id = 3,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3905] = {
-	.class_hid = BNXT_ULP_CLASS_HID_223dc,
+	[4485] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34d6,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3906] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2acdc,
+	[4486] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a1a,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3907] = {
-	.class_hid = BNXT_ULP_CLASS_HID_359dc,
+	[4487] = {
+	.class_hid = BNXT_ULP_CLASS_HID_543e,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3908] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c2dc,
+	[4488] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a02,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 4,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_4_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_4_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3909] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20eec,
+	[4489] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34de,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3910] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2bbec,
+	[4490] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a12,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3911] = {
-	.class_hid = BNXT_ULP_CLASS_HID_324ec,
+	[4491] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a62,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3912] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d1ec,
+	[4492] = {
+	.class_hid = BNXT_ULP_CLASS_HID_14f2,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 5,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3913] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20ba0,
+	[4493] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34b6,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3914] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b4a0,
+	[4494] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a7a,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3915] = {
-	.class_hid = BNXT_ULP_CLASS_HID_321a0,
+	[4495] = {
+	.class_hid = BNXT_ULP_CLASS_HID_545e,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3916] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3aaa0,
+	[4496] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5a62,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 6,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3917] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23c90,
+	[4497] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34be,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3918] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a990,
+	[4498] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a72,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3919] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35290,
+	[4499] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4a02,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3920] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3df90,
+	[4500] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1492,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 7,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
-		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3921] = {
-	.class_hid = BNXT_ULP_CLASS_HID_24430,
+	[4501] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34a8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3922] = {
-	.class_hid = BNXT_ULP_CLASS_HID_295e4,
+	[4502] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a64,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3923] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31ee4,
+	[4503] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e04,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3924] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38be4,
+	[4504] = {
+	.class_hid = BNXT_ULP_CLASS_HID_07c0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3925] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25340,
+	[4505] = {
+	.class_hid = BNXT_ULP_CLASS_HID_593c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3926] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2dc40,
+	[4506] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ef8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3927] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34940,
+	[4507] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2298,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3928] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39734,
+	[4508] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2854,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3929] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22c34,
+	[4509] = {
+	.class_hid = BNXT_ULP_CLASS_HID_03f8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3930] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d934,
+	[4510] = {
+	.class_hid = BNXT_ULP_CLASS_HID_09b4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3931] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34234,
+	[4511] = {
+	.class_hid = BNXT_ULP_CLASS_HID_48a0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3932] = {
-	.class_hid = BNXT_ULP_CLASS_HID_393e8,
+	[4512] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1310,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3933] = {
-	.class_hid = BNXT_ULP_CLASS_HID_240e4,
+	[4513] = {
+	.class_hid = BNXT_ULP_CLASS_HID_240c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3934] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cde4,
+	[4514] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2dc8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3935] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31bd8,
+	[4515] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31e8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3936] = {
-	.class_hid = BNXT_ULP_CLASS_HID_384d8,
+	[4516] = {
+	.class_hid = BNXT_ULP_CLASS_HID_37a4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 8,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
 		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_8_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3937] = {
-	.class_hid = BNXT_ULP_CLASS_HID_23de0,
+	[4517] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34d0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3938] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a6e0,
+	[4518] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a1c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3939] = {
-	.class_hid = BNXT_ULP_CLASS_HID_353e0,
+	[4519] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e7c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3940] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3dce0,
+	[4520] = {
+	.class_hid = BNXT_ULP_CLASS_HID_07b8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3941] = {
-	.class_hid = BNXT_ULP_CLASS_HID_20930,
+	[4521] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5944,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3942] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2b230,
+	[4522] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5e80,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3943] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33f30,
+	[4523] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22e0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3944] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a830,
+	[4524] = {
+	.class_hid = BNXT_ULP_CLASS_HID_282c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3945] = {
-	.class_hid = BNXT_ULP_CLASS_HID_205e4,
+	[4525] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43124,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3946] = {
-	.class_hid = BNXT_ULP_CLASS_HID_28ee4,
+	[4526] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43760,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3947] = {
-	.class_hid = BNXT_ULP_CLASS_HID_33be4,
+	[4527] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41b40,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3948] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a4e4,
+	[4528] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4008c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3949] = {
-	.class_hid = BNXT_ULP_CLASS_HID_236d4,
+	[4529] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45588,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3950] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2a3d4,
+	[4530] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45bd4,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3951] = {
-	.class_hid = BNXT_ULP_CLASS_HID_32cd4,
+	[4531] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43f34,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3952] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3d9d4,
+	[4532] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42570,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 9,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
-		BNXT_ULP_HDR_BIT_O_UDP |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
+		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_9_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3953] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25e74,
+	[4533] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3488,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82273,16 +94317,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3954] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2cb74,
+	[4534] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a44,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82290,17 +94334,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3955] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31928,
+	[4535] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e24,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82308,17 +94352,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3956] = {
-	.class_hid = BNXT_ULP_CLASS_HID_38228,
+	[4536] = {
+	.class_hid = BNXT_ULP_CLASS_HID_07e0,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82326,18 +94370,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3957] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22d84,
+	[4537] = {
+	.class_hid = BNXT_ULP_CLASS_HID_591c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82345,17 +94389,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3958] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d684,
+	[4538] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ed8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82363,18 +94407,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3959] = {
-	.class_hid = BNXT_ULP_CLASS_HID_34384,
+	[4539] = {
+	.class_hid = BNXT_ULP_CLASS_HID_22b8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82382,18 +94426,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3960] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39178,
+	[4540] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2874,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82401,19 +94445,19 @@ 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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3961] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22678,
+	[4541] = {
+	.class_hid = BNXT_ULP_CLASS_HID_03d8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82421,18 +94465,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3962] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2d378,
+	[4542] = {
+	.class_hid = BNXT_ULP_CLASS_HID_0994,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82440,19 +94483,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3963] = {
-	.class_hid = BNXT_ULP_CLASS_HID_35c78,
+	[4543] = {
+	.class_hid = BNXT_ULP_CLASS_HID_4880,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82460,19 +94502,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3964] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3c978,
+	[4544] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1330,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82480,20 +94521,19 @@ 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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3965] = {
-	.class_hid = BNXT_ULP_CLASS_HID_25b28,
+	[4545] = {
+	.class_hid = BNXT_ULP_CLASS_HID_242c,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82501,17 +94541,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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3966] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2c428,
+	[4546] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2de8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 4,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82519,18 +94560,19 @@ 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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3967] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3121c,
+	[4547] = {
+	.class_hid = BNXT_ULP_CLASS_HID_31c8,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82538,18 +94580,19 @@ 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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3968] = {
-	.class_hid = BNXT_ULP_CLASS_HID_39f1c,
+	[4548] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3784,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
-	.flow_pattern_id = 1,
+	.hdr_sig_id = 10,
+	.flow_sig_id = 68,
+	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
@@ -82557,23 +94600,24 @@ 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_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_10_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_10_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_10_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3969] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3488,
+	[4549] = {
+	.class_hid = BNXT_ULP_CLASS_HID_34b0,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 4,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
@@ -82581,16 +94625,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3970] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3a44,
+	[4550] = {
+	.class_hid = BNXT_ULP_CLASS_HID_3a7c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 4,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
@@ -82599,113 +94643,109 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3971] = {
-	.class_hid = BNXT_ULP_CLASS_HID_0994,
+	[4551] = {
+	.class_hid = BNXT_ULP_CLASS_HID_1e1c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 68,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3972] = {
-	.class_hid = BNXT_ULP_CLASS_HID_5ed8,
+	[4552] = {
+	.class_hid = BNXT_ULP_CLASS_HID_07d8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 68,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3973] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2de8,
+	[4553] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5924,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 4,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3974] = {
-	.class_hid = BNXT_ULP_CLASS_HID_07e0,
+	[4554] = {
+	.class_hid = BNXT_ULP_CLASS_HID_5ee0,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 4,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3975] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1330,
+	[4555] = {
+	.class_hid = BNXT_ULP_CLASS_HID_2280,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 68,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3976] = {
-	.class_hid = BNXT_ULP_CLASS_HID_2874,
+	[4556] = {
+	.class_hid = BNXT_ULP_CLASS_HID_284c,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 68,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
@@ -82716,129 +94756,131 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3977] = {
-	.class_hid = BNXT_ULP_CLASS_HID_3784,
+	[4557] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43144,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 4,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3978] = {
-	.class_hid = BNXT_ULP_CLASS_HID_03d8,
+	[4558] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43700,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 4,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3979] = {
-	.class_hid = BNXT_ULP_CLASS_HID_591c,
+	[4559] = {
+	.class_hid = BNXT_ULP_CLASS_HID_41b20,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 68,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3980] = {
-	.class_hid = BNXT_ULP_CLASS_HID_242c,
+	[4560] = {
+	.class_hid = BNXT_ULP_CLASS_HID_400ec,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 68,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3981] = {
-	.class_hid = BNXT_ULP_CLASS_HID_1e24,
+	[4561] = {
+	.class_hid = BNXT_ULP_CLASS_HID_455e8,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 4,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3982] = {
-	.class_hid = BNXT_ULP_CLASS_HID_4880,
+	[4562] = {
+	.class_hid = BNXT_ULP_CLASS_HID_45bb4,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 4,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3983] = {
-	.class_hid = BNXT_ULP_CLASS_HID_22b8,
+	[4563] = {
+	.class_hid = BNXT_ULP_CLASS_HID_43f54,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 68,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
@@ -82846,26 +94888,28 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	},
-	[3984] = {
-	.class_hid = BNXT_ULP_CLASS_HID_31c8,
+	[4564] = {
+	.class_hid = BNXT_ULP_CLASS_HID_42510,
 	.class_tid = 2,
 	.hdr_sig_id = 11,
-	.flow_sig_id = 284,
+	.flow_sig_id = 68,
 	.flow_pattern_id = 2,
 	.hdr_sig = { .bits =
 		BNXT_ULP_HDR_BIT_O_ETH |
 		BNXT_ULP_HDR_BIT_OO_VLAN |
-		BNXT_ULP_HDR_BIT_O_IPV6 |
+		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_DMAC |
 		BNXT_ULP_HF2_11_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF2_11_BITMASK_O_ETH_TYPE |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID |
 		BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE |
-		BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID |
+		BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID |
 		BNXT_ULP_MATCH_TYPE_BITMASK_EM },
 	}
 };
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h
index a6da4729b9..866fff74c4 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h
@@ -1,24 +1,24 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
-/* date: Fri Jan 29 09:44:41 2021 */
+/* date: Thu Mar  4 10:12:06 2021 */
 
 #ifndef ULP_TEMPLATE_DB_H_
 #define ULP_TEMPLATE_DB_H_
 
-#define BNXT_ULP_REGFILE_MAX_SZ 34
+#define BNXT_ULP_REGFILE_MAX_SZ 38
 #define BNXT_ULP_MAX_NUM_DEVICES 4
 #define BNXT_ULP_LOG2_MAX_NUM_DEV 2
-#define BNXT_ULP_GEN_TBL_MAX_SZ 8
-#define BNXT_ULP_CLASS_SIG_TBL_MAX_SZ 262144
-#define BNXT_ULP_CLASS_MATCH_LIST_MAX_SZ 3985
+#define BNXT_ULP_GEN_TBL_MAX_SZ 10
+#define BNXT_ULP_CLASS_SIG_TBL_MAX_SZ 524288
+#define BNXT_ULP_CLASS_MATCH_LIST_MAX_SZ 4565
 #define BNXT_ULP_CLASS_HID_LOW_PRIME 5939
 #define BNXT_ULP_CLASS_HID_HIGH_PRIME 7669
 #define BNXT_ULP_CLASS_HID_SHFTR 31
 #define BNXT_ULP_CLASS_HID_SHFTL 31
-#define BNXT_ULP_CLASS_HID_MASK 262143
+#define BNXT_ULP_CLASS_HID_MASK 524287
 #define BNXT_ULP_ACT_SIG_TBL_MAX_SZ 2048
 #define BNXT_ULP_ACT_MATCH_LIST_MAX_SZ 86
 #define BNXT_ULP_ACT_HID_LOW_PRIME 7919
@@ -27,34 +27,33 @@
 #define BNXT_ULP_ACT_HID_SHFTL 26
 #define BNXT_ULP_ACT_HID_MASK 2047
 #define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 8
-#define BNXT_ULP_GLB_TEMPLATE_TBL_MAX_SZ 1
 #define BNXT_ULP_GLB_FIELD_TBL_SHIFT 7
 #define BNXT_ULP_HDR_SIG_ID_SHIFT 4
 #define BNXT_ULP_GLB_FIELD_TBL_SIZE 5595
-#define ULP_WH_PLUS_CLASS_TMPL_LIST_SIZE 8
-#define ULP_WH_PLUS_CLASS_TBL_LIST_SIZE 69
-#define ULP_WH_PLUS_CLASS_KEY_INFO_LIST_SIZE 418
-#define ULP_WH_PLUS_CLASS_IDENT_LIST_SIZE 17
-#define ULP_WH_PLUS_CLASS_RESULT_FIELD_LIST_SIZE 519
-#define ULP_WH_PLUS_CLASS_COND_LIST_SIZE 20
-#define ULP_STINGRAY_CLASS_TMPL_LIST_SIZE 7
-#define ULP_STINGRAY_CLASS_TBL_LIST_SIZE 38
-#define ULP_STINGRAY_CLASS_KEY_INFO_LIST_SIZE 192
-#define ULP_STINGRAY_CLASS_IDENT_LIST_SIZE 10
-#define ULP_STINGRAY_CLASS_RESULT_FIELD_LIST_SIZE 341
-#define ULP_STINGRAY_CLASS_COND_LIST_SIZE 10
+#define ULP_WH_PLUS_CLASS_TMPL_LIST_SIZE 5
+#define ULP_WH_PLUS_CLASS_TBL_LIST_SIZE 73
+#define ULP_WH_PLUS_CLASS_KEY_INFO_LIST_SIZE 484
+#define ULP_WH_PLUS_CLASS_IDENT_LIST_SIZE 20
+#define ULP_WH_PLUS_CLASS_RESULT_FIELD_LIST_SIZE 550
+#define ULP_WH_PLUS_CLASS_COND_LIST_SIZE 32
+#define ULP_THOR_CLASS_TMPL_LIST_SIZE 5
+#define ULP_THOR_CLASS_TBL_LIST_SIZE 26
+#define ULP_THOR_CLASS_KEY_INFO_LIST_SIZE 90
+#define ULP_THOR_CLASS_IDENT_LIST_SIZE 3
+#define ULP_THOR_CLASS_RESULT_FIELD_LIST_SIZE 138
+#define ULP_THOR_CLASS_COND_LIST_SIZE 6
 #define ULP_WH_PLUS_ACT_TMPL_LIST_SIZE 7
 #define ULP_WH_PLUS_ACT_TBL_LIST_SIZE 35
 #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 512
 #define ULP_WH_PLUS_ACT_COND_LIST_SIZE 26
-#define ULP_STINGRAY_ACT_TMPL_LIST_SIZE 2
-#define ULP_STINGRAY_ACT_TBL_LIST_SIZE 4
-#define ULP_STINGRAY_ACT_KEY_INFO_LIST_SIZE 0
-#define ULP_STINGRAY_ACT_IDENT_LIST_SIZE 0
-#define ULP_STINGRAY_ACT_RESULT_FIELD_LIST_SIZE 65
-#define ULP_STINGRAY_ACT_COND_LIST_SIZE 2
+#define ULP_THOR_ACT_TMPL_LIST_SIZE 7
+#define ULP_THOR_ACT_TBL_LIST_SIZE 0
+#define ULP_THOR_ACT_KEY_INFO_LIST_SIZE 0
+#define ULP_THOR_ACT_IDENT_LIST_SIZE 0
+#define ULP_THOR_ACT_RESULT_FIELD_LIST_SIZE 0
+#define ULP_THOR_ACT_COND_LIST_SIZE 0
 
 enum bnxt_ulp_act_bit {
 	BNXT_ULP_ACT_BIT_MARK                = 0x0000000000000001,
@@ -95,17 +94,19 @@ enum bnxt_ulp_hdr_bit {
 	BNXT_ULP_HDR_BIT_O_IPV6              = 0x0000000000000010,
 	BNXT_ULP_HDR_BIT_O_TCP               = 0x0000000000000020,
 	BNXT_ULP_HDR_BIT_O_UDP               = 0x0000000000000040,
-	BNXT_ULP_HDR_BIT_T_VXLAN             = 0x0000000000000080,
-	BNXT_ULP_HDR_BIT_T_GRE               = 0x0000000000000100,
-	BNXT_ULP_HDR_BIT_I_ETH               = 0x0000000000000200,
-	BNXT_ULP_HDR_BIT_IO_VLAN             = 0x0000000000000400,
-	BNXT_ULP_HDR_BIT_II_VLAN             = 0x0000000000000800,
-	BNXT_ULP_HDR_BIT_I_IPV4              = 0x0000000000001000,
-	BNXT_ULP_HDR_BIT_I_IPV6              = 0x0000000000002000,
-	BNXT_ULP_HDR_BIT_I_TCP               = 0x0000000000004000,
-	BNXT_ULP_HDR_BIT_I_UDP               = 0x0000000000008000,
-	BNXT_ULP_HDR_BIT_F1                  = 0x0000000000010000,
-	BNXT_ULP_HDR_BIT_LAST                = 0x0000000000020000
+	BNXT_ULP_HDR_BIT_O_ICMP              = 0x0000000000000080,
+	BNXT_ULP_HDR_BIT_T_VXLAN             = 0x0000000000000100,
+	BNXT_ULP_HDR_BIT_T_GRE               = 0x0000000000000200,
+	BNXT_ULP_HDR_BIT_I_ETH               = 0x0000000000000400,
+	BNXT_ULP_HDR_BIT_IO_VLAN             = 0x0000000000000800,
+	BNXT_ULP_HDR_BIT_II_VLAN             = 0x0000000000001000,
+	BNXT_ULP_HDR_BIT_I_IPV4              = 0x0000000000002000,
+	BNXT_ULP_HDR_BIT_I_IPV6              = 0x0000000000004000,
+	BNXT_ULP_HDR_BIT_I_TCP               = 0x0000000000008000,
+	BNXT_ULP_HDR_BIT_I_UDP               = 0x0000000000010000,
+	BNXT_ULP_HDR_BIT_I_ICMP              = 0x0000000000020000,
+	BNXT_ULP_HDR_BIT_F1                  = 0x0000000000040000,
+	BNXT_ULP_HDR_BIT_LAST                = 0x0000000000080000
 };
 
 enum bnxt_ulp_accept_opc {
@@ -145,44 +146,52 @@ enum bnxt_ulp_cf_idx {
 	BNXT_ULP_CF_IDX_I_L3 = 14,
 	BNXT_ULP_CF_IDX_O_L4 = 15,
 	BNXT_ULP_CF_IDX_I_L4 = 16,
-	BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT = 17,
-	BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT = 18,
-	BNXT_ULP_CF_IDX_I_L4_FB_SRC_PORT = 19,
-	BNXT_ULP_CF_IDX_I_L4_FB_DST_PORT = 20,
-	BNXT_ULP_CF_IDX_DEV_PORT_ID = 21,
-	BNXT_ULP_CF_IDX_DRV_FUNC_SVIF = 22,
-	BNXT_ULP_CF_IDX_DRV_FUNC_SPIF = 23,
-	BNXT_ULP_CF_IDX_DRV_FUNC_PARIF = 24,
-	BNXT_ULP_CF_IDX_DRV_FUNC_VNIC = 25,
-	BNXT_ULP_CF_IDX_DRV_FUNC_PHY_PORT = 26,
-	BNXT_ULP_CF_IDX_VF_FUNC_SVIF = 27,
-	BNXT_ULP_CF_IDX_VF_FUNC_SPIF = 28,
-	BNXT_ULP_CF_IDX_VF_FUNC_PARIF = 29,
-	BNXT_ULP_CF_IDX_VF_FUNC_VNIC = 30,
-	BNXT_ULP_CF_IDX_PHY_PORT_SVIF = 31,
-	BNXT_ULP_CF_IDX_PHY_PORT_SPIF = 32,
-	BNXT_ULP_CF_IDX_PHY_PORT_PARIF = 33,
-	BNXT_ULP_CF_IDX_PHY_PORT_VPORT = 34,
-	BNXT_ULP_CF_IDX_ACT_ENCAP_IPV4_FLAG = 35,
-	BNXT_ULP_CF_IDX_ACT_ENCAP_IPV6_FLAG = 36,
-	BNXT_ULP_CF_IDX_ACT_DEC_TTL = 37,
-	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL = 38,
-	BNXT_ULP_CF_IDX_ACT_PORT_IS_SET = 39,
-	BNXT_ULP_CF_IDX_ACT_PORT_TYPE = 40,
-	BNXT_ULP_CF_IDX_MATCH_PORT_TYPE = 41,
-	BNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP = 42,
-	BNXT_ULP_CF_IDX_MATCH_PORT_IS_PF = 43,
-	BNXT_ULP_CF_IDX_VF_TO_VF = 44,
-	BNXT_ULP_CF_IDX_L3_HDR_CNT = 45,
-	BNXT_ULP_CF_IDX_L4_HDR_CNT = 46,
-	BNXT_ULP_CF_IDX_VFR_MODE = 47,
-	BNXT_ULP_CF_IDX_L3_TUN = 48,
-	BNXT_ULP_CF_IDX_L3_TUN_DECAP = 49,
-	BNXT_ULP_CF_IDX_FID = 50,
-	BNXT_ULP_CF_IDX_HDR_SIG_ID = 51,
-	BNXT_ULP_CF_IDX_FLOW_SIG_ID = 52,
-	BNXT_ULP_CF_IDX_WC_MATCH = 53,
-	BNXT_ULP_CF_IDX_LAST = 54
+	BNXT_ULP_CF_IDX_O_L4_SRC_PORT = 17,
+	BNXT_ULP_CF_IDX_O_L4_DST_PORT = 18,
+	BNXT_ULP_CF_IDX_I_L4_SRC_PORT = 19,
+	BNXT_ULP_CF_IDX_I_L4_DST_PORT = 20,
+	BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT = 21,
+	BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT = 22,
+	BNXT_ULP_CF_IDX_I_L4_FB_SRC_PORT = 23,
+	BNXT_ULP_CF_IDX_I_L4_FB_DST_PORT = 24,
+	BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID = 25,
+	BNXT_ULP_CF_IDX_I_L3_FB_PROTO_ID = 26,
+	BNXT_ULP_CF_IDX_O_L3_PROTO_ID = 27,
+	BNXT_ULP_CF_IDX_I_L3_PROTO_ID = 28,
+	BNXT_ULP_CF_IDX_DEV_PORT_ID = 29,
+	BNXT_ULP_CF_IDX_DRV_FUNC_SVIF = 30,
+	BNXT_ULP_CF_IDX_DRV_FUNC_SPIF = 31,
+	BNXT_ULP_CF_IDX_DRV_FUNC_PARIF = 32,
+	BNXT_ULP_CF_IDX_DRV_FUNC_VNIC = 33,
+	BNXT_ULP_CF_IDX_DRV_FUNC_PHY_PORT = 34,
+	BNXT_ULP_CF_IDX_VF_FUNC_SVIF = 35,
+	BNXT_ULP_CF_IDX_VF_FUNC_SPIF = 36,
+	BNXT_ULP_CF_IDX_VF_FUNC_PARIF = 37,
+	BNXT_ULP_CF_IDX_VF_FUNC_VNIC = 38,
+	BNXT_ULP_CF_IDX_PHY_PORT_SVIF = 39,
+	BNXT_ULP_CF_IDX_PHY_PORT_SPIF = 40,
+	BNXT_ULP_CF_IDX_PHY_PORT_PARIF = 41,
+	BNXT_ULP_CF_IDX_PHY_PORT_VPORT = 42,
+	BNXT_ULP_CF_IDX_ACT_ENCAP_IPV4_FLAG = 43,
+	BNXT_ULP_CF_IDX_ACT_ENCAP_IPV6_FLAG = 44,
+	BNXT_ULP_CF_IDX_ACT_DEC_TTL = 45,
+	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL = 46,
+	BNXT_ULP_CF_IDX_ACT_PORT_IS_SET = 47,
+	BNXT_ULP_CF_IDX_ACT_PORT_TYPE = 48,
+	BNXT_ULP_CF_IDX_MATCH_PORT_TYPE = 49,
+	BNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP = 50,
+	BNXT_ULP_CF_IDX_MATCH_PORT_IS_PF = 51,
+	BNXT_ULP_CF_IDX_VF_TO_VF = 52,
+	BNXT_ULP_CF_IDX_L3_HDR_CNT = 53,
+	BNXT_ULP_CF_IDX_L4_HDR_CNT = 54,
+	BNXT_ULP_CF_IDX_VFR_MODE = 55,
+	BNXT_ULP_CF_IDX_L3_TUN = 56,
+	BNXT_ULP_CF_IDX_L3_TUN_DECAP = 57,
+	BNXT_ULP_CF_IDX_FID = 58,
+	BNXT_ULP_CF_IDX_HDR_SIG_ID = 59,
+	BNXT_ULP_CF_IDX_FLOW_SIG_ID = 60,
+	BNXT_ULP_CF_IDX_WC_MATCH = 61,
+	BNXT_ULP_CF_IDX_LAST = 62
 };
 
 enum bnxt_ulp_cond_list_opc {
@@ -310,8 +319,7 @@ enum bnxt_ulp_glb_rf_idx {
 	BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID = 3,
 	BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID = 4,
 	BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR = 5,
-	BNXT_ULP_GLB_RF_IDX_DEFAULT_ING_AREC_PTR = 6,
-	BNXT_ULP_GLB_RF_IDX_LAST = 7
+	BNXT_ULP_GLB_RF_IDX_LAST = 6
 };
 
 enum bnxt_ulp_hdr_type {
@@ -333,11 +341,11 @@ enum bnxt_ulp_if_tbl_opc {
 enum bnxt_ulp_index_tbl_opc {
 	BNXT_ULP_INDEX_TBL_OPC_NOT_USED = 0,
 	BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE = 1,
-	BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE = 2,
-	BNXT_ULP_INDEX_TBL_OPC_SRCH_ALLOC_WR_REGFILE = 3,
-	BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE = 4,
-	BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE = 5,
-	BNXT_ULP_INDEX_TBL_OPC_RD_REGFILE = 6,
+	BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE = 2,
+	BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE = 3,
+	BNXT_ULP_INDEX_TBL_OPC_RD_REGFILE = 4,
+	BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_GLB_REGFILE = 5,
+	BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE = 6,
 	BNXT_ULP_INDEX_TBL_OPC_LAST = 7
 };
 
@@ -424,7 +432,11 @@ enum bnxt_ulp_rf_idx {
 	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_LAST = 34
+	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_LAST = 38
 };
 
 enum bnxt_ulp_tcam_tbl_opc {
@@ -483,7 +495,8 @@ enum bnxt_ulp_resource_sub_type {
 	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM = 0,
 	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM = 1,
 	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SHARED_MIRROR = 2,
-	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE = 3
+	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE = 3,
+	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE = 4
 };
 
 enum bnxt_ulp_act_prop_sz {
@@ -801,4209 +814,4794 @@ enum ulp_wp_sym {
 	ULP_WP_SYM_RECYCLE_DST = 0x800
 };
 
-enum ulp_sr_sym {
-	ULP_SR_SYM_PKT_TYPE_IGNORE = 0,
-	ULP_SR_SYM_PKT_TYPE_L2 = 0,
-	ULP_SR_SYM_PKT_TYPE_0_IGNORE = 0,
-	ULP_SR_SYM_PKT_TYPE_0_L2 = 0,
-	ULP_SR_SYM_PKT_TYPE_1_IGNORE = 0,
-	ULP_SR_SYM_PKT_TYPE_1_L2 = 0,
-	ULP_SR_SYM_RECYCLE_CNT_IGNORE = 0,
-	ULP_SR_SYM_RECYCLE_CNT_ZERO = 0,
-	ULP_SR_SYM_RECYCLE_CNT_ONE = 1,
-	ULP_SR_SYM_RECYCLE_CNT_TWO = 2,
-	ULP_SR_SYM_RECYCLE_CNT_THREE = 3,
-	ULP_SR_SYM_AGG_ERROR_IGNORE = 0,
-	ULP_SR_SYM_AGG_ERROR_NO = 0,
-	ULP_SR_SYM_AGG_ERROR_YES = 1,
-	ULP_SR_SYM_RESERVED_IGNORE = 0,
-	ULP_SR_SYM_HREC_NEXT_IGNORE = 0,
-	ULP_SR_SYM_HREC_NEXT_NO = 0,
-	ULP_SR_SYM_HREC_NEXT_YES = 1,
-	ULP_SR_SYM_TL2_HDR_VALID_IGNORE = 0,
-	ULP_SR_SYM_TL2_HDR_VALID_NO = 0,
-	ULP_SR_SYM_TL2_HDR_VALID_YES = 1,
-	ULP_SR_SYM_TL2_HDR_TYPE_IGNORE = 0,
-	ULP_SR_SYM_TL2_HDR_TYPE_DIX = 0,
-	ULP_SR_SYM_TL2_UC_MC_BC_IGNORE = 0,
-	ULP_SR_SYM_TL2_UC_MC_BC_UC = 0,
-	ULP_SR_SYM_TL2_UC_MC_BC_MC = 2,
-	ULP_SR_SYM_TL2_UC_MC_BC_BC = 3,
-	ULP_SR_SYM_TL2_VTAG_PRESENT_IGNORE = 0,
-	ULP_SR_SYM_TL2_VTAG_PRESENT_NO = 0,
-	ULP_SR_SYM_TL2_VTAG_PRESENT_YES = 1,
-	ULP_SR_SYM_TL2_TWO_VTAGS_IGNORE = 0,
-	ULP_SR_SYM_TL2_TWO_VTAGS_NO = 0,
-	ULP_SR_SYM_TL2_TWO_VTAGS_YES = 1,
-	ULP_SR_SYM_TL3_HDR_VALID_IGNORE = 0,
-	ULP_SR_SYM_TL3_HDR_VALID_NO = 0,
-	ULP_SR_SYM_TL3_HDR_VALID_YES = 1,
-	ULP_SR_SYM_TL3_HDR_ERROR_IGNORE = 0,
-	ULP_SR_SYM_TL3_HDR_ERROR_NO = 0,
-	ULP_SR_SYM_TL3_HDR_ERROR_YES = 1,
-	ULP_SR_SYM_TL3_HDR_TYPE_IGNORE = 0,
-	ULP_SR_SYM_TL3_HDR_TYPE_IPV4 = 0,
-	ULP_SR_SYM_TL3_HDR_TYPE_IPV6 = 1,
-	ULP_SR_SYM_TL3_HDR_ISIP_IGNORE = 0,
-	ULP_SR_SYM_TL3_HDR_ISIP_NO = 0,
-	ULP_SR_SYM_TL3_HDR_ISIP_YES = 1,
-	ULP_SR_SYM_TL3_IPV6_CMP_SRC_IGNORE = 0,
-	ULP_SR_SYM_TL3_IPV6_CMP_SRC_NO = 0,
-	ULP_SR_SYM_TL3_IPV6_CMP_SRC_YES = 1,
-	ULP_SR_SYM_TL3_IPV6_CMP_DST_IGNORE = 0,
-	ULP_SR_SYM_TL3_IPV6_CMP_DST_NO = 0,
-	ULP_SR_SYM_TL3_IPV6_CMP_DST_YES = 1,
-	ULP_SR_SYM_TL4_HDR_VALID_IGNORE = 0,
-	ULP_SR_SYM_TL4_HDR_VALID_NO = 0,
-	ULP_SR_SYM_TL4_HDR_VALID_YES = 1,
-	ULP_SR_SYM_TL4_HDR_ERROR_IGNORE = 0,
-	ULP_SR_SYM_TL4_HDR_ERROR_NO = 0,
-	ULP_SR_SYM_TL4_HDR_ERROR_YES = 1,
-	ULP_SR_SYM_TL4_HDR_IS_UDP_TCP_IGNORE = 0,
-	ULP_SR_SYM_TL4_HDR_IS_UDP_TCP_NO = 0,
-	ULP_SR_SYM_TL4_HDR_IS_UDP_TCP_YES = 1,
-	ULP_SR_SYM_TL4_HDR_TYPE_IGNORE = 0,
-	ULP_SR_SYM_TL4_HDR_TYPE_TCP = 0,
-	ULP_SR_SYM_TL4_HDR_TYPE_UDP = 1,
-	ULP_SR_SYM_TUN_HDR_VALID_IGNORE = 0,
-	ULP_SR_SYM_TUN_HDR_VALID_NO = 0,
-	ULP_SR_SYM_TUN_HDR_VALID_YES = 1,
-	ULP_SR_SYM_TUN_HDR_ERROR_IGNORE = 0,
-	ULP_SR_SYM_TUN_HDR_ERROR_NO = 0,
-	ULP_SR_SYM_TUN_HDR_ERROR_YES = 1,
-	ULP_SR_SYM_TUN_HDR_TYPE_IGNORE = 0,
-	ULP_SR_SYM_TUN_HDR_TYPE_VXLAN = 0,
-	ULP_SR_SYM_TUN_HDR_TYPE_GENEVE = 1,
-	ULP_SR_SYM_TUN_HDR_TYPE_NVGRE = 2,
-	ULP_SR_SYM_TUN_HDR_TYPE_GRE = 3,
-	ULP_SR_SYM_TUN_HDR_TYPE_IPV4 = 4,
-	ULP_SR_SYM_TUN_HDR_TYPE_IPV6 = 5,
-	ULP_SR_SYM_TUN_HDR_TYPE_PPPOE = 6,
-	ULP_SR_SYM_TUN_HDR_TYPE_MPLS = 7,
-	ULP_SR_SYM_TUN_HDR_TYPE_UPAR1 = 8,
-	ULP_SR_SYM_TUN_HDR_TYPE_UPAR2 = 9,
-	ULP_SR_SYM_TUN_HDR_TYPE_NONE = 15,
-	ULP_SR_SYM_TUN_HDR_FLAGS_IGNORE = 0,
-	ULP_SR_SYM_L2_HDR_VALID_IGNORE = 0,
-	ULP_SR_SYM_L2_HDR_VALID_NO = 0,
-	ULP_SR_SYM_L2_HDR_VALID_YES = 1,
-	ULP_SR_SYM_L2_HDR_ERROR_IGNORE = 0,
-	ULP_SR_SYM_L2_HDR_ERROR_NO = 0,
-	ULP_SR_SYM_L2_HDR_ERROR_YES = 1,
-	ULP_SR_SYM_L2_HDR_TYPE_IGNORE = 0,
-	ULP_SR_SYM_L2_HDR_TYPE_DIX = 0,
-	ULP_SR_SYM_L2_HDR_TYPE_LLC_SNAP = 1,
-	ULP_SR_SYM_L2_HDR_TYPE_LLC = 2,
-	ULP_SR_SYM_L2_UC_MC_BC_IGNORE = 0,
-	ULP_SR_SYM_L2_UC_MC_BC_UC = 0,
-	ULP_SR_SYM_L2_UC_MC_BC_MC = 2,
-	ULP_SR_SYM_L2_UC_MC_BC_BC = 3,
-	ULP_SR_SYM_L2_VTAG_PRESENT_IGNORE = 0,
-	ULP_SR_SYM_L2_VTAG_PRESENT_NO = 0,
-	ULP_SR_SYM_L2_VTAG_PRESENT_YES = 1,
-	ULP_SR_SYM_L2_TWO_VTAGS_IGNORE = 0,
-	ULP_SR_SYM_L2_TWO_VTAGS_NO = 0,
-	ULP_SR_SYM_L2_TWO_VTAGS_YES = 1,
-	ULP_SR_SYM_L3_HDR_VALID_IGNORE = 0,
-	ULP_SR_SYM_L3_HDR_VALID_NO = 0,
-	ULP_SR_SYM_L3_HDR_VALID_YES = 1,
-	ULP_SR_SYM_L3_HDR_ERROR_IGNORE = 0,
-	ULP_SR_SYM_L3_HDR_ERROR_NO = 0,
-	ULP_SR_SYM_L3_HDR_ERROR_YES = 1,
-	ULP_SR_SYM_L3_HDR_TYPE_IGNORE = 0,
-	ULP_SR_SYM_L3_HDR_TYPE_IPV4 = 0,
-	ULP_SR_SYM_L3_HDR_TYPE_IPV6 = 1,
-	ULP_SR_SYM_L3_HDR_TYPE_ARP = 2,
-	ULP_SR_SYM_L3_HDR_TYPE_PTP = 3,
-	ULP_SR_SYM_L3_HDR_TYPE_EAPOL = 4,
-	ULP_SR_SYM_L3_HDR_TYPE_ROCE = 5,
-	ULP_SR_SYM_L3_HDR_TYPE_FCOE = 6,
-	ULP_SR_SYM_L3_HDR_TYPE_UPAR1 = 7,
-	ULP_SR_SYM_L3_HDR_TYPE_UPAR2 = 8,
-	ULP_SR_SYM_L3_HDR_ISIP_IGNORE = 0,
-	ULP_SR_SYM_L3_HDR_ISIP_NO = 0,
-	ULP_SR_SYM_L3_HDR_ISIP_YES = 1,
-	ULP_SR_SYM_L3_IPV6_CMP_SRC_IGNORE = 0,
-	ULP_SR_SYM_L3_IPV6_CMP_SRC_NO = 0,
-	ULP_SR_SYM_L3_IPV6_CMP_SRC_YES = 1,
-	ULP_SR_SYM_L3_IPV6_CMP_DST_IGNORE = 0,
-	ULP_SR_SYM_L3_IPV6_CMP_DST_NO = 0,
-	ULP_SR_SYM_L3_IPV6_CMP_DST_YES = 1,
-	ULP_SR_SYM_L4_HDR_VALID_IGNORE = 0,
-	ULP_SR_SYM_L4_HDR_VALID_NO = 0,
-	ULP_SR_SYM_L4_HDR_VALID_YES = 1,
-	ULP_SR_SYM_L4_HDR_ERROR_IGNORE = 0,
-	ULP_SR_SYM_L4_HDR_ERROR_NO = 0,
-	ULP_SR_SYM_L4_HDR_ERROR_YES = 1,
-	ULP_SR_SYM_L4_HDR_TYPE_IGNORE = 0,
-	ULP_SR_SYM_L4_HDR_TYPE_TCP = 0,
-	ULP_SR_SYM_L4_HDR_TYPE_UDP = 1,
-	ULP_SR_SYM_L4_HDR_TYPE_ICMP = 2,
-	ULP_SR_SYM_L4_HDR_TYPE_UPAR1 = 3,
-	ULP_SR_SYM_L4_HDR_TYPE_UPAR2 = 4,
-	ULP_SR_SYM_L4_HDR_TYPE_BTH_V1 = 5,
-	ULP_SR_SYM_L4_HDR_IS_UDP_TCP_IGNORE = 0,
-	ULP_SR_SYM_L4_HDR_IS_UDP_TCP_NO = 0,
-	ULP_SR_SYM_L4_HDR_IS_UDP_TCP_YES = 1,
-	ULP_SR_SYM_POP_VLAN_NO = 0,
-	ULP_SR_SYM_POP_VLAN_YES = 1,
-	ULP_SR_SYM_DECAP_FUNC_NONE = 0,
-	ULP_SR_SYM_DECAP_FUNC_THRU_TL2 = 3,
-	ULP_SR_SYM_DECAP_FUNC_THRU_TL3 = 8,
-	ULP_SR_SYM_DECAP_FUNC_THRU_TL4 = 9,
-	ULP_SR_SYM_DECAP_FUNC_THRU_TUN = 10,
-	ULP_SR_SYM_DECAP_FUNC_THRU_L2 = 11,
-	ULP_SR_SYM_DECAP_FUNC_THRU_L3 = 12,
-	ULP_SR_SYM_DECAP_FUNC_THRU_L4 = 13,
-	ULP_SR_SYM_ECV_VALID_NO = 0,
-	ULP_SR_SYM_ECV_VALID_YES = 1,
-	ULP_SR_SYM_ECV_CUSTOM_EN_NO = 0,
-	ULP_SR_SYM_ECV_CUSTOM_EN_YES = 1,
-	ULP_SR_SYM_ECV_L2_EN_NO = 0,
-	ULP_SR_SYM_ECV_L2_EN_YES = 1,
-	ULP_SR_SYM_ECV_VTAG_TYPE_NOP = 0,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI = 1,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_1_IVLAN_PRI = 2,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_1_REMAP_DIFFSERV = 3,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_2_ENCAP_PRI = 4,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_2_REMAP_DIFFSERV = 5,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_ENCAP_PRI = 6,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_REMAP_DIFFSERV = 7,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_0 = 8,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_1 = 8,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_2 = 8,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_3 = 8,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_4 = 8,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_5 = 8,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_6 = 8,
-	ULP_SR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_7 = 8,
-	ULP_SR_SYM_ECV_L3_TYPE_NONE = 0,
-	ULP_SR_SYM_ECV_L3_TYPE_IPV4 = 4,
-	ULP_SR_SYM_ECV_L3_TYPE_IPV6 = 5,
-	ULP_SR_SYM_ECV_L3_TYPE_MPLS_8847 = 6,
-	ULP_SR_SYM_ECV_L3_TYPE_MPLS_8848 = 7,
-	ULP_SR_SYM_ECV_L4_TYPE_NONE = 0,
-	ULP_SR_SYM_ECV_L4_TYPE_UDP = 4,
-	ULP_SR_SYM_ECV_L4_TYPE_UDP_CSUM = 5,
-	ULP_SR_SYM_ECV_L4_TYPE_UDP_ENTROPY = 6,
-	ULP_SR_SYM_ECV_L4_TYPE_UDP_ENTROPY_CSUM = 7,
-	ULP_SR_SYM_ECV_TUN_TYPE_NONE = 0,
-	ULP_SR_SYM_ECV_TUN_TYPE_GENERIC = 1,
-	ULP_SR_SYM_ECV_TUN_TYPE_VXLAN = 2,
-	ULP_SR_SYM_ECV_TUN_TYPE_NGE = 3,
-	ULP_SR_SYM_ECV_TUN_TYPE_NVGRE = 4,
-	ULP_SR_SYM_ECV_TUN_TYPE_GRE = 5,
-	ULP_SR_SYM_EEM_ACT_REC_INT = 0,
-	ULP_SR_SYM_EEM_EXT_FLOW_CNTR = 1,
-	ULP_SR_SYM_UC_ACT_REC = 0,
-	ULP_SR_SYM_MC_ACT_REC = 1,
-	ULP_SR_SYM_ACT_REC_DROP_YES = 1,
-	ULP_SR_SYM_ACT_REC_DROP_NO = 0,
-	ULP_SR_SYM_ACT_REC_POP_VLAN_YES = 1,
-	ULP_SR_SYM_ACT_REC_POP_VLAN_NO = 0,
-	ULP_SR_SYM_ACT_REC_METER_EN_YES = 1,
-	ULP_SR_SYM_ACT_REC_METER_EN_NO = 0,
-	ULP_SR_SYM_LOOPBACK_PORT = 16,
-	ULP_SR_SYM_LOOPBACK_PARIF = 15,
-	ULP_SR_SYM_EXT_EM_MAX_KEY_SIZE = 448,
-	ULP_SR_SYM_MATCH_TYPE_EM = 0,
-	ULP_SR_SYM_MATCH_TYPE_WM = 1,
-	ULP_SR_SYM_IP_PROTO_ICMP = 1,
-	ULP_SR_SYM_IP_PROTO_IGMP = 2,
-	ULP_SR_SYM_IP_PROTO_IP_IN_IP = 4,
-	ULP_SR_SYM_IP_PROTO_TCP = 6,
-	ULP_SR_SYM_IP_PROTO_UDP = 17,
-	ULP_SR_SYM_VF_FUNC_PARIF = 15,
-	ULP_SR_SYM_NO = 0,
-	ULP_SR_SYM_YES = 1,
-	ULP_SR_SYM_RECYCLE_DST = 0x800
+enum ulp_thor_sym {
+	ULP_THOR_SYM_CTXT_OPCODE_BYPASS_CFA = 0,
+	ULP_THOR_SYM_CTXT_OPCODE_BYPASS_LKUP = 1,
+	ULP_THOR_SYM_CTXT_OPCODE_META_UPDATE = 2,
+	ULP_THOR_SYM_CTXT_OPCODE_NORMAL_FLOW = 3,
+	ULP_THOR_SYM_CTXT_OPCODE_DROP = 4,
+	ULP_THOR_SYM_PKT_TYPE_IGNORE = 0,
+	ULP_THOR_SYM_PKT_TYPE_L2 = 0,
+	ULP_THOR_SYM_PKT_TYPE_0_IGNORE = 0,
+	ULP_THOR_SYM_PKT_TYPE_0_L2 = 0,
+	ULP_THOR_SYM_PKT_TYPE_1_IGNORE = 0,
+	ULP_THOR_SYM_PKT_TYPE_1_L2 = 0,
+	ULP_THOR_SYM_RECYCLE_CNT_IGNORE = 0,
+	ULP_THOR_SYM_RECYCLE_CNT_ZERO = 0,
+	ULP_THOR_SYM_RECYCLE_CNT_ONE = 1,
+	ULP_THOR_SYM_RECYCLE_CNT_TWO = 2,
+	ULP_THOR_SYM_RECYCLE_CNT_THREE = 3,
+	ULP_THOR_SYM_AGG_ERROR_IGNORE = 0,
+	ULP_THOR_SYM_AGG_ERROR_NO = 0,
+	ULP_THOR_SYM_AGG_ERROR_YES = 1,
+	ULP_THOR_SYM_RESERVED_IGNORE = 0,
+	ULP_THOR_SYM_HREC_NEXT_IGNORE = 0,
+	ULP_THOR_SYM_HREC_NEXT_NO = 0,
+	ULP_THOR_SYM_HREC_NEXT_YES = 1,
+	ULP_THOR_SYM_TL2_HDR_VALID_IGNORE = 0,
+	ULP_THOR_SYM_TL2_HDR_VALID_NO = 0,
+	ULP_THOR_SYM_TL2_HDR_VALID_YES = 1,
+	ULP_THOR_SYM_TL2_HDR_TYPE_IGNORE = 0,
+	ULP_THOR_SYM_TL2_HDR_TYPE_DIX = 0,
+	ULP_THOR_SYM_TL2_UC_MC_BC_IGNORE = 0,
+	ULP_THOR_SYM_TL2_UC_MC_BC_UC = 0,
+	ULP_THOR_SYM_TL2_UC_MC_BC_MC = 2,
+	ULP_THOR_SYM_TL2_UC_MC_BC_BC = 3,
+	ULP_THOR_SYM_TL2_VTAG_PRESENT_IGNORE = 0,
+	ULP_THOR_SYM_TL2_VTAG_PRESENT_NO = 0,
+	ULP_THOR_SYM_TL2_VTAG_PRESENT_YES = 1,
+	ULP_THOR_SYM_TL2_TWO_VTAGS_IGNORE = 0,
+	ULP_THOR_SYM_TL2_TWO_VTAGS_NO = 0,
+	ULP_THOR_SYM_TL2_TWO_VTAGS_YES = 1,
+	ULP_THOR_SYM_TL3_HDR_VALID_IGNORE = 0,
+	ULP_THOR_SYM_TL3_HDR_VALID_NO = 0,
+	ULP_THOR_SYM_TL3_HDR_VALID_YES = 1,
+	ULP_THOR_SYM_TL3_HDR_ERROR_IGNORE = 0,
+	ULP_THOR_SYM_TL3_HDR_ERROR_NO = 0,
+	ULP_THOR_SYM_TL3_HDR_ERROR_YES = 1,
+	ULP_THOR_SYM_TL3_HDR_TYPE_IGNORE = 0,
+	ULP_THOR_SYM_TL3_HDR_TYPE_IPV4 = 0,
+	ULP_THOR_SYM_TL3_HDR_TYPE_IPV6 = 1,
+	ULP_THOR_SYM_TL3_HDR_ISIP_IGNORE = 0,
+	ULP_THOR_SYM_TL3_HDR_ISIP_NO = 0,
+	ULP_THOR_SYM_TL3_HDR_ISIP_YES = 1,
+	ULP_THOR_SYM_TL3_IPV6_CMP_SRC_IGNORE = 0,
+	ULP_THOR_SYM_TL3_IPV6_CMP_SRC_NO = 0,
+	ULP_THOR_SYM_TL3_IPV6_CMP_SRC_YES = 1,
+	ULP_THOR_SYM_TL3_IPV6_CMP_DST_IGNORE = 0,
+	ULP_THOR_SYM_TL3_IPV6_CMP_DST_NO = 0,
+	ULP_THOR_SYM_TL3_IPV6_CMP_DST_YES = 1,
+	ULP_THOR_SYM_TL4_HDR_VALID_IGNORE = 0,
+	ULP_THOR_SYM_TL4_HDR_VALID_NO = 0,
+	ULP_THOR_SYM_TL4_HDR_VALID_YES = 1,
+	ULP_THOR_SYM_TL4_HDR_ERROR_IGNORE = 0,
+	ULP_THOR_SYM_TL4_HDR_ERROR_NO = 0,
+	ULP_THOR_SYM_TL4_HDR_ERROR_YES = 1,
+	ULP_THOR_SYM_TL4_HDR_IS_UDP_TCP_IGNORE = 0,
+	ULP_THOR_SYM_TL4_HDR_IS_UDP_TCP_NO = 0,
+	ULP_THOR_SYM_TL4_HDR_IS_UDP_TCP_YES = 1,
+	ULP_THOR_SYM_TL4_HDR_TYPE_IGNORE = 0,
+	ULP_THOR_SYM_TL4_HDR_TYPE_TCP = 0,
+	ULP_THOR_SYM_TL4_HDR_TYPE_UDP = 1,
+	ULP_THOR_SYM_TUN_HDR_VALID_IGNORE = 0,
+	ULP_THOR_SYM_TUN_HDR_VALID_NO = 0,
+	ULP_THOR_SYM_TUN_HDR_VALID_YES = 1,
+	ULP_THOR_SYM_TUN_HDR_ERROR_IGNORE = 0,
+	ULP_THOR_SYM_TUN_HDR_ERROR_NO = 0,
+	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_GENEVE = 1,
+	ULP_THOR_SYM_TUN_HDR_TYPE_NVGRE = 2,
+	ULP_THOR_SYM_TUN_HDR_TYPE_GRE = 3,
+	ULP_THOR_SYM_TUN_HDR_TYPE_IPV4 = 4,
+	ULP_THOR_SYM_TUN_HDR_TYPE_IPV6 = 5,
+	ULP_THOR_SYM_TUN_HDR_TYPE_PPPOE = 6,
+	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_NONE = 15,
+	ULP_THOR_SYM_TUN_HDR_FLAGS_IGNORE = 0,
+	ULP_THOR_SYM_L2_HDR_VALID_IGNORE = 0,
+	ULP_THOR_SYM_L2_HDR_VALID_NO = 0,
+	ULP_THOR_SYM_L2_HDR_VALID_YES = 1,
+	ULP_THOR_SYM_L2_HDR_ERROR_IGNORE = 0,
+	ULP_THOR_SYM_L2_HDR_ERROR_NO = 0,
+	ULP_THOR_SYM_L2_HDR_ERROR_YES = 1,
+	ULP_THOR_SYM_L2_HDR_TYPE_IGNORE = 0,
+	ULP_THOR_SYM_L2_HDR_TYPE_DIX = 0,
+	ULP_THOR_SYM_L2_HDR_TYPE_LLC_SNAP = 1,
+	ULP_THOR_SYM_L2_HDR_TYPE_LLC = 2,
+	ULP_THOR_SYM_L2_UC_MC_BC_IGNORE = 0,
+	ULP_THOR_SYM_L2_UC_MC_BC_UC = 0,
+	ULP_THOR_SYM_L2_UC_MC_BC_MC = 2,
+	ULP_THOR_SYM_L2_UC_MC_BC_BC = 3,
+	ULP_THOR_SYM_L2_VTAG_PRESENT_IGNORE = 0,
+	ULP_THOR_SYM_L2_VTAG_PRESENT_NO = 0,
+	ULP_THOR_SYM_L2_VTAG_PRESENT_YES = 1,
+	ULP_THOR_SYM_L2_TWO_VTAGS_IGNORE = 0,
+	ULP_THOR_SYM_L2_TWO_VTAGS_NO = 0,
+	ULP_THOR_SYM_L2_TWO_VTAGS_YES = 1,
+	ULP_THOR_SYM_L3_HDR_VALID_IGNORE = 0,
+	ULP_THOR_SYM_L3_HDR_VALID_NO = 0,
+	ULP_THOR_SYM_L3_HDR_VALID_YES = 1,
+	ULP_THOR_SYM_L3_HDR_ERROR_IGNORE = 0,
+	ULP_THOR_SYM_L3_HDR_ERROR_NO = 0,
+	ULP_THOR_SYM_L3_HDR_ERROR_YES = 1,
+	ULP_THOR_SYM_L3_HDR_TYPE_IGNORE = 0,
+	ULP_THOR_SYM_L3_HDR_TYPE_IPV4 = 0,
+	ULP_THOR_SYM_L3_HDR_TYPE_IPV6 = 1,
+	ULP_THOR_SYM_L3_HDR_TYPE_ARP = 2,
+	ULP_THOR_SYM_L3_HDR_TYPE_PTP = 3,
+	ULP_THOR_SYM_L3_HDR_TYPE_EAPOL = 4,
+	ULP_THOR_SYM_L3_HDR_TYPE_ROCE = 5,
+	ULP_THOR_SYM_L3_HDR_TYPE_FCOE = 6,
+	ULP_THOR_SYM_L3_HDR_TYPE_UPAR1 = 7,
+	ULP_THOR_SYM_L3_HDR_TYPE_UPAR2 = 8,
+	ULP_THOR_SYM_L3_HDR_ISIP_IGNORE = 0,
+	ULP_THOR_SYM_L3_HDR_ISIP_NO = 0,
+	ULP_THOR_SYM_L3_HDR_ISIP_YES = 1,
+	ULP_THOR_SYM_L3_IPV6_CMP_SRC_IGNORE = 0,
+	ULP_THOR_SYM_L3_IPV6_CMP_SRC_NO = 0,
+	ULP_THOR_SYM_L3_IPV6_CMP_SRC_YES = 1,
+	ULP_THOR_SYM_L3_IPV6_CMP_DST_IGNORE = 0,
+	ULP_THOR_SYM_L3_IPV6_CMP_DST_NO = 0,
+	ULP_THOR_SYM_L3_IPV6_CMP_DST_YES = 1,
+	ULP_THOR_SYM_L4_HDR_VALID_IGNORE = 0,
+	ULP_THOR_SYM_L4_HDR_VALID_NO = 0,
+	ULP_THOR_SYM_L4_HDR_VALID_YES = 1,
+	ULP_THOR_SYM_L4_HDR_ERROR_IGNORE = 0,
+	ULP_THOR_SYM_L4_HDR_ERROR_NO = 0,
+	ULP_THOR_SYM_L4_HDR_ERROR_YES = 1,
+	ULP_THOR_SYM_L4_HDR_TYPE_IGNORE = 0,
+	ULP_THOR_SYM_L4_HDR_TYPE_TCP = 0,
+	ULP_THOR_SYM_L4_HDR_TYPE_UDP = 1,
+	ULP_THOR_SYM_L4_HDR_TYPE_ICMP = 2,
+	ULP_THOR_SYM_L4_HDR_TYPE_UPAR1 = 3,
+	ULP_THOR_SYM_L4_HDR_TYPE_UPAR2 = 4,
+	ULP_THOR_SYM_L4_HDR_TYPE_BTH_V1 = 5,
+	ULP_THOR_SYM_L4_HDR_IS_UDP_TCP_IGNORE = 0,
+	ULP_THOR_SYM_L4_HDR_IS_UDP_TCP_NO = 0,
+	ULP_THOR_SYM_L4_HDR_IS_UDP_TCP_YES = 1,
+	ULP_THOR_SYM_POP_VLAN_NO = 0,
+	ULP_THOR_SYM_POP_VLAN_YES = 1,
+	ULP_THOR_SYM_DECAP_FUNC_NONE = 0,
+	ULP_THOR_SYM_DECAP_FUNC_THRU_TL2 = 3,
+	ULP_THOR_SYM_DECAP_FUNC_THRU_TL3 = 8,
+	ULP_THOR_SYM_DECAP_FUNC_THRU_TL4 = 9,
+	ULP_THOR_SYM_DECAP_FUNC_THRU_TUN = 10,
+	ULP_THOR_SYM_DECAP_FUNC_THRU_L2 = 11,
+	ULP_THOR_SYM_DECAP_FUNC_THRU_L3 = 12,
+	ULP_THOR_SYM_DECAP_FUNC_THRU_L4 = 13,
+	ULP_THOR_SYM_ECV_VALID_NO = 0,
+	ULP_THOR_SYM_ECV_VALID_YES = 1,
+	ULP_THOR_SYM_ECV_CUSTOM_EN_NO = 0,
+	ULP_THOR_SYM_ECV_CUSTOM_EN_YES = 1,
+	ULP_THOR_SYM_ECV_L2_EN_NO = 0,
+	ULP_THOR_SYM_ECV_L2_EN_YES = 1,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_NOP = 0,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI = 1,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_1_IVLAN_PRI = 2,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_1_REMAP_DIFFSERV = 3,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_2_ENCAP_PRI = 4,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_2_REMAP_DIFFSERV = 5,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_ENCAP_PRI = 6,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_REMAP_DIFFSERV = 7,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_0 = 8,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_1 = 8,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_2 = 8,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_3 = 8,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_4 = 8,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_5 = 8,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_6 = 8,
+	ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_0_PRI_7 = 8,
+	ULP_THOR_SYM_ECV_L3_TYPE_NONE = 0,
+	ULP_THOR_SYM_ECV_L3_TYPE_IPV4 = 4,
+	ULP_THOR_SYM_ECV_L3_TYPE_IPV6 = 5,
+	ULP_THOR_SYM_ECV_L3_TYPE_MPLS_8847 = 6,
+	ULP_THOR_SYM_ECV_L3_TYPE_MPLS_8848 = 7,
+	ULP_THOR_SYM_ECV_L4_TYPE_NONE = 0,
+	ULP_THOR_SYM_ECV_L4_TYPE_UDP = 4,
+	ULP_THOR_SYM_ECV_L4_TYPE_UDP_CSUM = 5,
+	ULP_THOR_SYM_ECV_L4_TYPE_UDP_ENTROPY = 6,
+	ULP_THOR_SYM_ECV_L4_TYPE_UDP_ENTROPY_CSUM = 7,
+	ULP_THOR_SYM_ECV_TUN_TYPE_NONE = 0,
+	ULP_THOR_SYM_ECV_TUN_TYPE_GENERIC = 1,
+	ULP_THOR_SYM_ECV_TUN_TYPE_VXLAN = 2,
+	ULP_THOR_SYM_ECV_TUN_TYPE_NGE = 3,
+	ULP_THOR_SYM_ECV_TUN_TYPE_NVGRE = 4,
+	ULP_THOR_SYM_ECV_TUN_TYPE_GRE = 5,
+	ULP_THOR_SYM_EEM_ACT_REC_INT = 0,
+	ULP_THOR_SYM_EEM_EXT_FLOW_CNTR = 0,
+	ULP_THOR_SYM_UC_ACT_REC = 0,
+	ULP_THOR_SYM_MC_ACT_REC = 1,
+	ULP_THOR_SYM_ACT_REC_DROP_YES = 1,
+	ULP_THOR_SYM_ACT_REC_DROP_NO = 0,
+	ULP_THOR_SYM_ACT_REC_POP_VLAN_YES = 1,
+	ULP_THOR_SYM_ACT_REC_POP_VLAN_NO = 0,
+	ULP_THOR_SYM_ACT_REC_METER_EN_YES = 1,
+	ULP_THOR_SYM_ACT_REC_METER_EN_NO = 0,
+	ULP_THOR_SYM_LOOPBACK_PORT = 3,
+	ULP_THOR_SYM_LOOPBACK_PARIF = 15,
+	ULP_THOR_SYM_EXT_EM_MAX_KEY_SIZE = 0,
+	ULP_THOR_SYM_MATCH_TYPE_EM = 0,
+	ULP_THOR_SYM_MATCH_TYPE_WM = 1,
+	ULP_THOR_SYM_IP_PROTO_ICMP = 1,
+	ULP_THOR_SYM_IP_PROTO_IGMP = 2,
+	ULP_THOR_SYM_IP_PROTO_IP_IN_IP = 4,
+	ULP_THOR_SYM_IP_PROTO_TCP = 6,
+	ULP_THOR_SYM_IP_PROTO_UDP = 17,
+	ULP_THOR_SYM_VF_FUNC_PARIF = 15,
+	ULP_THOR_SYM_NO = 0,
+	ULP_THOR_SYM_YES = 1,
+	ULP_THOR_SYM_RECYCLE_DST = 0x800
 };
 
 enum bnxt_ulp_class_hid {
-	BNXT_ULP_CLASS_HID_26d1 = 0x26d1,
-	BNXT_ULP_CLASS_HID_0071 = 0x0071,
-	BNXT_ULP_CLASS_HID_53a5 = 0x53a5,
-	BNXT_ULP_CLASS_HID_1d49 = 0x1d49,
-	BNXT_ULP_CLASS_HID_2095 = 0x2095,
-	BNXT_ULP_CLASS_HID_5701 = 0x5701,
-	BNXT_ULP_CLASS_HID_4d79 = 0x4d79,
-	BNXT_ULP_CLASS_HID_170d = 0x170d,
-	BNXT_ULP_CLASS_HID_1a69 = 0x1a69,
-	BNXT_ULP_CLASS_HID_50c5 = 0x50c5,
-	BNXT_ULP_CLASS_HID_473d = 0x473d,
-	BNXT_ULP_CLASS_HID_10c1 = 0x10c1,
-	BNXT_ULP_CLASS_HID_142d = 0x142d,
-	BNXT_ULP_CLASS_HID_4a99 = 0x4a99,
-	BNXT_ULP_CLASS_HID_40f1 = 0x40f1,
-	BNXT_ULP_CLASS_HID_0a85 = 0x0a85,
-	BNXT_ULP_CLASS_HID_0179 = 0x0179,
-	BNXT_ULP_CLASS_HID_37d5 = 0x37d5,
-	BNXT_ULP_CLASS_HID_2e4d = 0x2e4d,
-	BNXT_ULP_CLASS_HID_54ad = 0x54ad,
-	BNXT_ULP_CLASS_HID_5809 = 0x5809,
-	BNXT_ULP_CLASS_HID_31a9 = 0x31a9,
-	BNXT_ULP_CLASS_HID_2801 = 0x2801,
-	BNXT_ULP_CLASS_HID_4e61 = 0x4e61,
-	BNXT_ULP_CLASS_HID_2561 = 0x2561,
-	BNXT_ULP_CLASS_HID_2bad = 0x2bad,
-	BNXT_ULP_CLASS_HID_054d = 0x054d,
-	BNXT_ULP_CLASS_HID_5bdd = 0x5bdd,
-	BNXT_ULP_CLASS_HID_26f1 = 0x26f1,
-	BNXT_ULP_CLASS_HID_13cf1 = 0x13cf1,
-	BNXT_ULP_CLASS_HID_252f1 = 0x252f1,
-	BNXT_ULP_CLASS_HID_30c25 = 0x30c25,
-	BNXT_ULP_CLASS_HID_0051 = 0x0051,
-	BNXT_ULP_CLASS_HID_11651 = 0x11651,
-	BNXT_ULP_CLASS_HID_22c51 = 0x22c51,
-	BNXT_ULP_CLASS_HID_34251 = 0x34251,
-	BNXT_ULP_CLASS_HID_5385 = 0x5385,
-	BNXT_ULP_CLASS_HID_10cc9 = 0x10cc9,
-	BNXT_ULP_CLASS_HID_222c9 = 0x222c9,
-	BNXT_ULP_CLASS_HID_338c9 = 0x338c9,
-	BNXT_ULP_CLASS_HID_1d69 = 0x1d69,
-	BNXT_ULP_CLASS_HID_13369 = 0x13369,
-	BNXT_ULP_CLASS_HID_24969 = 0x24969,
-	BNXT_ULP_CLASS_HID_3025d = 0x3025d,
-	BNXT_ULP_CLASS_HID_20b5 = 0x20b5,
-	BNXT_ULP_CLASS_HID_136b5 = 0x136b5,
-	BNXT_ULP_CLASS_HID_24cb5 = 0x24cb5,
-	BNXT_ULP_CLASS_HID_305f9 = 0x305f9,
-	BNXT_ULP_CLASS_HID_5721 = 0x5721,
-	BNXT_ULP_CLASS_HID_11015 = 0x11015,
-	BNXT_ULP_CLASS_HID_22615 = 0x22615,
-	BNXT_ULP_CLASS_HID_33c15 = 0x33c15,
-	BNXT_ULP_CLASS_HID_4d59 = 0x4d59,
-	BNXT_ULP_CLASS_HID_1068d = 0x1068d,
-	BNXT_ULP_CLASS_HID_21c8d = 0x21c8d,
-	BNXT_ULP_CLASS_HID_3328d = 0x3328d,
-	BNXT_ULP_CLASS_HID_172d = 0x172d,
-	BNXT_ULP_CLASS_HID_12d2d = 0x12d2d,
-	BNXT_ULP_CLASS_HID_2432d = 0x2432d,
-	BNXT_ULP_CLASS_HID_3592d = 0x3592d,
-	BNXT_ULP_CLASS_HID_1a49 = 0x1a49,
-	BNXT_ULP_CLASS_HID_13049 = 0x13049,
-	BNXT_ULP_CLASS_HID_24649 = 0x24649,
-	BNXT_ULP_CLASS_HID_35c49 = 0x35c49,
-	BNXT_ULP_CLASS_HID_50e5 = 0x50e5,
-	BNXT_ULP_CLASS_HID_10a29 = 0x10a29,
-	BNXT_ULP_CLASS_HID_22029 = 0x22029,
-	BNXT_ULP_CLASS_HID_33629 = 0x33629,
-	BNXT_ULP_CLASS_HID_471d = 0x471d,
-	BNXT_ULP_CLASS_HID_10041 = 0x10041,
-	BNXT_ULP_CLASS_HID_21641 = 0x21641,
-	BNXT_ULP_CLASS_HID_32c41 = 0x32c41,
-	BNXT_ULP_CLASS_HID_10e1 = 0x10e1,
-	BNXT_ULP_CLASS_HID_126e1 = 0x126e1,
-	BNXT_ULP_CLASS_HID_23ce1 = 0x23ce1,
-	BNXT_ULP_CLASS_HID_352e1 = 0x352e1,
-	BNXT_ULP_CLASS_HID_140d = 0x140d,
-	BNXT_ULP_CLASS_HID_12a0d = 0x12a0d,
-	BNXT_ULP_CLASS_HID_2400d = 0x2400d,
-	BNXT_ULP_CLASS_HID_3560d = 0x3560d,
-	BNXT_ULP_CLASS_HID_4ab9 = 0x4ab9,
-	BNXT_ULP_CLASS_HID_103ed = 0x103ed,
-	BNXT_ULP_CLASS_HID_219ed = 0x219ed,
-	BNXT_ULP_CLASS_HID_32fed = 0x32fed,
-	BNXT_ULP_CLASS_HID_40d1 = 0x40d1,
-	BNXT_ULP_CLASS_HID_156d1 = 0x156d1,
-	BNXT_ULP_CLASS_HID_21005 = 0x21005,
-	BNXT_ULP_CLASS_HID_32605 = 0x32605,
-	BNXT_ULP_CLASS_HID_0aa5 = 0x0aa5,
-	BNXT_ULP_CLASS_HID_120a5 = 0x120a5,
-	BNXT_ULP_CLASS_HID_236a5 = 0x236a5,
-	BNXT_ULP_CLASS_HID_34ca5 = 0x34ca5,
-	BNXT_ULP_CLASS_HID_0159 = 0x0159,
-	BNXT_ULP_CLASS_HID_11759 = 0x11759,
-	BNXT_ULP_CLASS_HID_22d59 = 0x22d59,
-	BNXT_ULP_CLASS_HID_34359 = 0x34359,
-	BNXT_ULP_CLASS_HID_37f5 = 0x37f5,
-	BNXT_ULP_CLASS_HID_14df5 = 0x14df5,
-	BNXT_ULP_CLASS_HID_20739 = 0x20739,
-	BNXT_ULP_CLASS_HID_31d39 = 0x31d39,
-	BNXT_ULP_CLASS_HID_2e6d = 0x2e6d,
-	BNXT_ULP_CLASS_HID_1446d = 0x1446d,
-	BNXT_ULP_CLASS_HID_25a6d = 0x25a6d,
-	BNXT_ULP_CLASS_HID_31351 = 0x31351,
-	BNXT_ULP_CLASS_HID_548d = 0x548d,
-	BNXT_ULP_CLASS_HID_10df1 = 0x10df1,
-	BNXT_ULP_CLASS_HID_223f1 = 0x223f1,
-	BNXT_ULP_CLASS_HID_339f1 = 0x339f1,
-	BNXT_ULP_CLASS_HID_5829 = 0x5829,
-	BNXT_ULP_CLASS_HID_1111d = 0x1111d,
-	BNXT_ULP_CLASS_HID_2271d = 0x2271d,
-	BNXT_ULP_CLASS_HID_33d1d = 0x33d1d,
-	BNXT_ULP_CLASS_HID_3189 = 0x3189,
-	BNXT_ULP_CLASS_HID_14789 = 0x14789,
-	BNXT_ULP_CLASS_HID_200fd = 0x200fd,
-	BNXT_ULP_CLASS_HID_316fd = 0x316fd,
-	BNXT_ULP_CLASS_HID_2821 = 0x2821,
-	BNXT_ULP_CLASS_HID_13e21 = 0x13e21,
-	BNXT_ULP_CLASS_HID_25421 = 0x25421,
-	BNXT_ULP_CLASS_HID_30d15 = 0x30d15,
-	BNXT_ULP_CLASS_HID_4e41 = 0x4e41,
-	BNXT_ULP_CLASS_HID_107b5 = 0x107b5,
-	BNXT_ULP_CLASS_HID_21db5 = 0x21db5,
-	BNXT_ULP_CLASS_HID_333b5 = 0x333b5,
-	BNXT_ULP_CLASS_HID_2541 = 0x2541,
-	BNXT_ULP_CLASS_HID_2b8d = 0x2b8d,
-	BNXT_ULP_CLASS_HID_056d = 0x056d,
-	BNXT_ULP_CLASS_HID_5bfd = 0x5bfd,
-	BNXT_ULP_CLASS_HID_2691 = 0x2691,
-	BNXT_ULP_CLASS_HID_13c91 = 0x13c91,
-	BNXT_ULP_CLASS_HID_25291 = 0x25291,
-	BNXT_ULP_CLASS_HID_30c45 = 0x30c45,
-	BNXT_ULP_CLASS_HID_0031 = 0x0031,
-	BNXT_ULP_CLASS_HID_11631 = 0x11631,
-	BNXT_ULP_CLASS_HID_22c31 = 0x22c31,
-	BNXT_ULP_CLASS_HID_34231 = 0x34231,
-	BNXT_ULP_CLASS_HID_53e5 = 0x53e5,
-	BNXT_ULP_CLASS_HID_10ca9 = 0x10ca9,
-	BNXT_ULP_CLASS_HID_222a9 = 0x222a9,
-	BNXT_ULP_CLASS_HID_338a9 = 0x338a9,
-	BNXT_ULP_CLASS_HID_1d09 = 0x1d09,
-	BNXT_ULP_CLASS_HID_13309 = 0x13309,
-	BNXT_ULP_CLASS_HID_24909 = 0x24909,
-	BNXT_ULP_CLASS_HID_3023d = 0x3023d,
-	BNXT_ULP_CLASS_HID_20d5 = 0x20d5,
-	BNXT_ULP_CLASS_HID_136d5 = 0x136d5,
-	BNXT_ULP_CLASS_HID_24cd5 = 0x24cd5,
-	BNXT_ULP_CLASS_HID_30599 = 0x30599,
-	BNXT_ULP_CLASS_HID_5741 = 0x5741,
-	BNXT_ULP_CLASS_HID_11075 = 0x11075,
-	BNXT_ULP_CLASS_HID_22675 = 0x22675,
-	BNXT_ULP_CLASS_HID_33c75 = 0x33c75,
-	BNXT_ULP_CLASS_HID_4d39 = 0x4d39,
-	BNXT_ULP_CLASS_HID_106ed = 0x106ed,
-	BNXT_ULP_CLASS_HID_21ced = 0x21ced,
-	BNXT_ULP_CLASS_HID_332ed = 0x332ed,
-	BNXT_ULP_CLASS_HID_174d = 0x174d,
-	BNXT_ULP_CLASS_HID_12d4d = 0x12d4d,
-	BNXT_ULP_CLASS_HID_2434d = 0x2434d,
-	BNXT_ULP_CLASS_HID_3594d = 0x3594d,
-	BNXT_ULP_CLASS_HID_1a29 = 0x1a29,
-	BNXT_ULP_CLASS_HID_13029 = 0x13029,
-	BNXT_ULP_CLASS_HID_24629 = 0x24629,
-	BNXT_ULP_CLASS_HID_35c29 = 0x35c29,
-	BNXT_ULP_CLASS_HID_5085 = 0x5085,
-	BNXT_ULP_CLASS_HID_10a49 = 0x10a49,
-	BNXT_ULP_CLASS_HID_22049 = 0x22049,
-	BNXT_ULP_CLASS_HID_33649 = 0x33649,
-	BNXT_ULP_CLASS_HID_477d = 0x477d,
-	BNXT_ULP_CLASS_HID_10021 = 0x10021,
-	BNXT_ULP_CLASS_HID_21621 = 0x21621,
-	BNXT_ULP_CLASS_HID_32c21 = 0x32c21,
-	BNXT_ULP_CLASS_HID_1081 = 0x1081,
-	BNXT_ULP_CLASS_HID_12681 = 0x12681,
-	BNXT_ULP_CLASS_HID_23c81 = 0x23c81,
-	BNXT_ULP_CLASS_HID_35281 = 0x35281,
-	BNXT_ULP_CLASS_HID_146d = 0x146d,
-	BNXT_ULP_CLASS_HID_12a6d = 0x12a6d,
-	BNXT_ULP_CLASS_HID_2406d = 0x2406d,
-	BNXT_ULP_CLASS_HID_3566d = 0x3566d,
-	BNXT_ULP_CLASS_HID_4ad9 = 0x4ad9,
-	BNXT_ULP_CLASS_HID_1038d = 0x1038d,
-	BNXT_ULP_CLASS_HID_2198d = 0x2198d,
-	BNXT_ULP_CLASS_HID_32f8d = 0x32f8d,
-	BNXT_ULP_CLASS_HID_40b1 = 0x40b1,
-	BNXT_ULP_CLASS_HID_156b1 = 0x156b1,
-	BNXT_ULP_CLASS_HID_21065 = 0x21065,
-	BNXT_ULP_CLASS_HID_32665 = 0x32665,
-	BNXT_ULP_CLASS_HID_0ac5 = 0x0ac5,
-	BNXT_ULP_CLASS_HID_120c5 = 0x120c5,
-	BNXT_ULP_CLASS_HID_236c5 = 0x236c5,
-	BNXT_ULP_CLASS_HID_34cc5 = 0x34cc5,
-	BNXT_ULP_CLASS_HID_0139 = 0x0139,
-	BNXT_ULP_CLASS_HID_11739 = 0x11739,
-	BNXT_ULP_CLASS_HID_22d39 = 0x22d39,
-	BNXT_ULP_CLASS_HID_34339 = 0x34339,
-	BNXT_ULP_CLASS_HID_3795 = 0x3795,
-	BNXT_ULP_CLASS_HID_14d95 = 0x14d95,
-	BNXT_ULP_CLASS_HID_20759 = 0x20759,
-	BNXT_ULP_CLASS_HID_31d59 = 0x31d59,
-	BNXT_ULP_CLASS_HID_2e0d = 0x2e0d,
-	BNXT_ULP_CLASS_HID_1440d = 0x1440d,
-	BNXT_ULP_CLASS_HID_25a0d = 0x25a0d,
-	BNXT_ULP_CLASS_HID_31331 = 0x31331,
-	BNXT_ULP_CLASS_HID_54ed = 0x54ed,
-	BNXT_ULP_CLASS_HID_10d91 = 0x10d91,
-	BNXT_ULP_CLASS_HID_22391 = 0x22391,
-	BNXT_ULP_CLASS_HID_33991 = 0x33991,
-	BNXT_ULP_CLASS_HID_5849 = 0x5849,
-	BNXT_ULP_CLASS_HID_1117d = 0x1117d,
-	BNXT_ULP_CLASS_HID_2277d = 0x2277d,
-	BNXT_ULP_CLASS_HID_33d7d = 0x33d7d,
-	BNXT_ULP_CLASS_HID_31e9 = 0x31e9,
-	BNXT_ULP_CLASS_HID_147e9 = 0x147e9,
-	BNXT_ULP_CLASS_HID_2009d = 0x2009d,
-	BNXT_ULP_CLASS_HID_3169d = 0x3169d,
-	BNXT_ULP_CLASS_HID_2841 = 0x2841,
-	BNXT_ULP_CLASS_HID_13e41 = 0x13e41,
-	BNXT_ULP_CLASS_HID_25441 = 0x25441,
-	BNXT_ULP_CLASS_HID_30d75 = 0x30d75,
-	BNXT_ULP_CLASS_HID_4e21 = 0x4e21,
-	BNXT_ULP_CLASS_HID_107d5 = 0x107d5,
-	BNXT_ULP_CLASS_HID_21dd5 = 0x21dd5,
-	BNXT_ULP_CLASS_HID_333d5 = 0x333d5,
-	BNXT_ULP_CLASS_HID_2521 = 0x2521,
-	BNXT_ULP_CLASS_HID_2bed = 0x2bed,
-	BNXT_ULP_CLASS_HID_050d = 0x050d,
-	BNXT_ULP_CLASS_HID_5b9d = 0x5b9d,
-	BNXT_ULP_CLASS_HID_1865 = 0x1865,
-	BNXT_ULP_CLASS_HID_389d = 0x389d,
-	BNXT_ULP_CLASS_HID_123d = 0x123d,
-	BNXT_ULP_CLASS_HID_4ef1 = 0x4ef1,
+	BNXT_ULP_CLASS_HID_05d1 = 0x05d1,
 	BNXT_ULP_CLASS_HID_1229 = 0x1229,
-	BNXT_ULP_CLASS_HID_3241 = 0x3241,
-	BNXT_ULP_CLASS_HID_0be1 = 0x0be1,
-	BNXT_ULP_CLASS_HID_48b5 = 0x48b5,
 	BNXT_ULP_CLASS_HID_0bed = 0x0bed,
+	BNXT_ULP_CLASS_HID_1865 = 0x1865,
+	BNXT_ULP_CLASS_HID_25c9 = 0x25c9,
+	BNXT_ULP_CLASS_HID_3241 = 0x3241,
 	BNXT_ULP_CLASS_HID_2c05 = 0x2c05,
-	BNXT_ULP_CLASS_HID_05a5 = 0x05a5,
+	BNXT_ULP_CLASS_HID_389d = 0x389d,
+	BNXT_ULP_CLASS_HID_3c3d = 0x3c3d,
+	BNXT_ULP_CLASS_HID_48b5 = 0x48b5,
 	BNXT_ULP_CLASS_HID_4279 = 0x4279,
-	BNXT_ULP_CLASS_HID_05d1 = 0x05d1,
-	BNXT_ULP_CLASS_HID_25c9 = 0x25c9,
+	BNXT_ULP_CLASS_HID_4ef1 = 0x4ef1,
 	BNXT_ULP_CLASS_HID_5c55 = 0x5c55,
-	BNXT_ULP_CLASS_HID_3c3d = 0x3c3d,
-	BNXT_ULP_CLASS_HID_4fc9 = 0x4fc9,
-	BNXT_ULP_CLASS_HID_1335 = 0x1335,
-	BNXT_ULP_CLASS_HID_4981 = 0x4981,
-	BNXT_ULP_CLASS_HID_2969 = 0x2969,
-	BNXT_ULP_CLASS_HID_498d = 0x498d,
-	BNXT_ULP_CLASS_HID_0cf9 = 0x0cf9,
-	BNXT_ULP_CLASS_HID_4345 = 0x4345,
-	BNXT_ULP_CLASS_HID_232d = 0x232d,
-	BNXT_ULP_CLASS_HID_2579 = 0x2579,
-	BNXT_ULP_CLASS_HID_2bb5 = 0x2bb5,
-	BNXT_ULP_CLASS_HID_4bad = 0x4bad,
-	BNXT_ULP_CLASS_HID_4591 = 0x4591,
+	BNXT_ULP_CLASS_HID_0be1 = 0x0be1,
+	BNXT_ULP_CLASS_HID_05a5 = 0x05a5,
+	BNXT_ULP_CLASS_HID_123d = 0x123d,
+	BNXT_ULP_CLASS_HID_4142d = 0x4142d,
+	BNXT_ULP_CLASS_HID_42095 = 0x42095,
+	BNXT_ULP_CLASS_HID_41a69 = 0x41a69,
+	BNXT_ULP_CLASS_HID_426d1 = 0x426d1,
+	BNXT_ULP_CLASS_HID_44a99 = 0x44a99,
+	BNXT_ULP_CLASS_HID_45701 = 0x45701,
+	BNXT_ULP_CLASS_HID_450c5 = 0x450c5,
+	BNXT_ULP_CLASS_HID_40071 = 0x40071,
+	BNXT_ULP_CLASS_HID_40a85 = 0x40a85,
+	BNXT_ULP_CLASS_HID_4170d = 0x4170d,
+	BNXT_ULP_CLASS_HID_410c1 = 0x410c1,
+	BNXT_ULP_CLASS_HID_41d49 = 0x41d49,
+	BNXT_ULP_CLASS_HID_440f1 = 0x440f1,
+	BNXT_ULP_CLASS_HID_44d79 = 0x44d79,
+	BNXT_ULP_CLASS_HID_4473d = 0x4473d,
+	BNXT_ULP_CLASS_HID_453a5 = 0x453a5,
+	BNXT_ULP_CLASS_HID_244e3 = 0x244e3,
+	BNXT_ULP_CLASS_HID_2517b = 0x2517b,
+	BNXT_ULP_CLASS_HID_24b3f = 0x24b3f,
+	BNXT_ULP_CLASS_HID_257b7 = 0x257b7,
+	BNXT_ULP_CLASS_HID_22f5f = 0x22f5f,
+	BNXT_ULP_CLASS_HID_23bd7 = 0x23bd7,
+	BNXT_ULP_CLASS_HID_2359b = 0x2359b,
+	BNXT_ULP_CLASS_HID_24213 = 0x24213,
+	BNXT_ULP_CLASS_HID_20bab = 0x20bab,
+	BNXT_ULP_CLASS_HID_21823 = 0x21823,
+	BNXT_ULP_CLASS_HID_211e7 = 0x211e7,
+	BNXT_ULP_CLASS_HID_21e7f = 0x21e7f,
+	BNXT_ULP_CLASS_HID_252f3 = 0x252f3,
+	BNXT_ULP_CLASS_HID_2029f = 0x2029f,
+	BNXT_ULP_CLASS_HID_2590f = 0x2590f,
+	BNXT_ULP_CLASS_HID_208db = 0x208db,
+	BNXT_ULP_CLASS_HID_231d3 = 0x231d3,
+	BNXT_ULP_CLASS_HID_23e2b = 0x23e2b,
+	BNXT_ULP_CLASS_HID_237ef = 0x237ef,
+	BNXT_ULP_CLASS_HID_24467 = 0x24467,
+	BNXT_ULP_CLASS_HID_21c0f = 0x21c0f,
+	BNXT_ULP_CLASS_HID_22887 = 0x22887,
+	BNXT_ULP_CLASS_HID_2224b = 0x2224b,
+	BNXT_ULP_CLASS_HID_22ec3 = 0x22ec3,
+	BNXT_ULP_CLASS_HID_25547 = 0x25547,
+	BNXT_ULP_CLASS_HID_20513 = 0x20513,
+	BNXT_ULP_CLASS_HID_25b83 = 0x25b83,
+	BNXT_ULP_CLASS_HID_20b2f = 0x20b2f,
+	BNXT_ULP_CLASS_HID_23fa3 = 0x23fa3,
+	BNXT_ULP_CLASS_HID_24c3b = 0x24c3b,
+	BNXT_ULP_CLASS_HID_245ff = 0x245ff,
+	BNXT_ULP_CLASS_HID_25277 = 0x25277,
+	BNXT_ULP_CLASS_HID_64037 = 0x64037,
+	BNXT_ULP_CLASS_HID_64c8f = 0x64c8f,
+	BNXT_ULP_CLASS_HID_64673 = 0x64673,
+	BNXT_ULP_CLASS_HID_652cb = 0x652cb,
+	BNXT_ULP_CLASS_HID_62a93 = 0x62a93,
+	BNXT_ULP_CLASS_HID_636eb = 0x636eb,
+	BNXT_ULP_CLASS_HID_630af = 0x630af,
+	BNXT_ULP_CLASS_HID_63d27 = 0x63d27,
+	BNXT_ULP_CLASS_HID_606ff = 0x606ff,
+	BNXT_ULP_CLASS_HID_61377 = 0x61377,
+	BNXT_ULP_CLASS_HID_60d3b = 0x60d3b,
+	BNXT_ULP_CLASS_HID_619b3 = 0x619b3,
+	BNXT_ULP_CLASS_HID_64e07 = 0x64e07,
+	BNXT_ULP_CLASS_HID_65a9f = 0x65a9f,
+	BNXT_ULP_CLASS_HID_65443 = 0x65443,
+	BNXT_ULP_CLASS_HID_603ef = 0x603ef,
+	BNXT_ULP_CLASS_HID_62ce7 = 0x62ce7,
+	BNXT_ULP_CLASS_HID_6397f = 0x6397f,
+	BNXT_ULP_CLASS_HID_63323 = 0x63323,
+	BNXT_ULP_CLASS_HID_63fbb = 0x63fbb,
+	BNXT_ULP_CLASS_HID_61743 = 0x61743,
+	BNXT_ULP_CLASS_HID_623db = 0x623db,
+	BNXT_ULP_CLASS_HID_61d9f = 0x61d9f,
+	BNXT_ULP_CLASS_HID_62a17 = 0x62a17,
+	BNXT_ULP_CLASS_HID_6509b = 0x6509b,
+	BNXT_ULP_CLASS_HID_60027 = 0x60027,
+	BNXT_ULP_CLASS_HID_656d7 = 0x656d7,
+	BNXT_ULP_CLASS_HID_60663 = 0x60663,
+	BNXT_ULP_CLASS_HID_63af7 = 0x63af7,
+	BNXT_ULP_CLASS_HID_6474f = 0x6474f,
+	BNXT_ULP_CLASS_HID_64133 = 0x64133,
+	BNXT_ULP_CLASS_HID_64d8b = 0x64d8b,
+	BNXT_ULP_CLASS_HID_a3fb = 0xa3fb,
+	BNXT_ULP_CLASS_HID_b063 = 0xb063,
+	BNXT_ULP_CLASS_HID_aa27 = 0xaa27,
+	BNXT_ULP_CLASS_HID_b6af = 0xb6af,
+	BNXT_ULP_CLASS_HID_8e47 = 0x8e47,
+	BNXT_ULP_CLASS_HID_9acf = 0x9acf,
+	BNXT_ULP_CLASS_HID_9483 = 0x9483,
+	BNXT_ULP_CLASS_HID_a10b = 0xa10b,
+	BNXT_ULP_CLASS_HID_c78f = 0xc78f,
+	BNXT_ULP_CLASS_HID_d3f7 = 0xd3f7,
+	BNXT_ULP_CLASS_HID_cdcb = 0xcdcb,
+	BNXT_ULP_CLASS_HID_da33 = 0xda33,
+	BNXT_ULP_CLASS_HID_b1eb = 0xb1eb,
+	BNXT_ULP_CLASS_HID_be53 = 0xbe53,
+	BNXT_ULP_CLASS_HID_b817 = 0xb817,
+	BNXT_ULP_CLASS_HID_c49f = 0xc49f,
+	BNXT_ULP_CLASS_HID_49f2f = 0x49f2f,
+	BNXT_ULP_CLASS_HID_4ab97 = 0x4ab97,
+	BNXT_ULP_CLASS_HID_4a56b = 0x4a56b,
+	BNXT_ULP_CLASS_HID_4b1d3 = 0x4b1d3,
+	BNXT_ULP_CLASS_HID_4898b = 0x4898b,
+	BNXT_ULP_CLASS_HID_495f3 = 0x495f3,
+	BNXT_ULP_CLASS_HID_48fb7 = 0x48fb7,
+	BNXT_ULP_CLASS_HID_49c3f = 0x49c3f,
+	BNXT_ULP_CLASS_HID_4c2b3 = 0x4c2b3,
+	BNXT_ULP_CLASS_HID_4cf3b = 0x4cf3b,
+	BNXT_ULP_CLASS_HID_4c8ff = 0x4c8ff,
+	BNXT_ULP_CLASS_HID_4d567 = 0x4d567,
+	BNXT_ULP_CLASS_HID_4ad1f = 0x4ad1f,
+	BNXT_ULP_CLASS_HID_4b987 = 0x4b987,
+	BNXT_ULP_CLASS_HID_4b35b = 0x4b35b,
+	BNXT_ULP_CLASS_HID_4bfc3 = 0x4bfc3,
+	BNXT_ULP_CLASS_HID_1b9fb = 0x1b9fb,
+	BNXT_ULP_CLASS_HID_1c663 = 0x1c663,
+	BNXT_ULP_CLASS_HID_1c027 = 0x1c027,
+	BNXT_ULP_CLASS_HID_1ccaf = 0x1ccaf,
+	BNXT_ULP_CLASS_HID_1a447 = 0x1a447,
+	BNXT_ULP_CLASS_HID_1b0cf = 0x1b0cf,
+	BNXT_ULP_CLASS_HID_1aa83 = 0x1aa83,
+	BNXT_ULP_CLASS_HID_1b70b = 0x1b70b,
+	BNXT_ULP_CLASS_HID_180b3 = 0x180b3,
+	BNXT_ULP_CLASS_HID_18d3b = 0x18d3b,
+	BNXT_ULP_CLASS_HID_186ff = 0x186ff,
+	BNXT_ULP_CLASS_HID_19367 = 0x19367,
+	BNXT_ULP_CLASS_HID_1c7eb = 0x1c7eb,
+	BNXT_ULP_CLASS_HID_1d453 = 0x1d453,
+	BNXT_ULP_CLASS_HID_1ce17 = 0x1ce17,
+	BNXT_ULP_CLASS_HID_1da9f = 0x1da9f,
+	BNXT_ULP_CLASS_HID_5b52f = 0x5b52f,
+	BNXT_ULP_CLASS_HID_5c197 = 0x5c197,
+	BNXT_ULP_CLASS_HID_5bb6b = 0x5bb6b,
+	BNXT_ULP_CLASS_HID_5c7d3 = 0x5c7d3,
+	BNXT_ULP_CLASS_HID_59f8b = 0x59f8b,
+	BNXT_ULP_CLASS_HID_5abf3 = 0x5abf3,
+	BNXT_ULP_CLASS_HID_5a5b7 = 0x5a5b7,
+	BNXT_ULP_CLASS_HID_5b23f = 0x5b23f,
+	BNXT_ULP_CLASS_HID_5d8b3 = 0x5d8b3,
+	BNXT_ULP_CLASS_HID_5886f = 0x5886f,
+	BNXT_ULP_CLASS_HID_58223 = 0x58223,
+	BNXT_ULP_CLASS_HID_58eab = 0x58eab,
+	BNXT_ULP_CLASS_HID_5c31f = 0x5c31f,
+	BNXT_ULP_CLASS_HID_5cf87 = 0x5cf87,
+	BNXT_ULP_CLASS_HID_5c95b = 0x5c95b,
+	BNXT_ULP_CLASS_HID_5d5c3 = 0x5d5c3,
+	BNXT_ULP_CLASS_HID_05f1 = 0x05f1,
+	BNXT_ULP_CLASS_HID_1209 = 0x1209,
+	BNXT_ULP_CLASS_HID_0bcd = 0x0bcd,
 	BNXT_ULP_CLASS_HID_1845 = 0x1845,
-	BNXT_ULP_CLASS_HID_1399 = 0x1399,
-	BNXT_ULP_CLASS_HID_0eed = 0x0eed,
-	BNXT_ULP_CLASS_HID_0a21 = 0x0a21,
+	BNXT_ULP_CLASS_HID_25e9 = 0x25e9,
+	BNXT_ULP_CLASS_HID_3261 = 0x3261,
+	BNXT_ULP_CLASS_HID_2c25 = 0x2c25,
 	BNXT_ULP_CLASS_HID_38bd = 0x38bd,
-	BNXT_ULP_CLASS_HID_33f1 = 0x33f1,
-	BNXT_ULP_CLASS_HID_2ec5 = 0x2ec5,
-	BNXT_ULP_CLASS_HID_2a19 = 0x2a19,
-	BNXT_ULP_CLASS_HID_121d = 0x121d,
-	BNXT_ULP_CLASS_HID_0d51 = 0x0d51,
-	BNXT_ULP_CLASS_HID_08a5 = 0x08a5,
-	BNXT_ULP_CLASS_HID_03f9 = 0x03f9,
+	BNXT_ULP_CLASS_HID_3c1d = 0x3c1d,
+	BNXT_ULP_CLASS_HID_4895 = 0x4895,
+	BNXT_ULP_CLASS_HID_4259 = 0x4259,
 	BNXT_ULP_CLASS_HID_4ed1 = 0x4ed1,
-	BNXT_ULP_CLASS_HID_4a25 = 0x4a25,
-	BNXT_ULP_CLASS_HID_4579 = 0x4579,
-	BNXT_ULP_CLASS_HID_404d = 0x404d,
-	BNXT_ULP_CLASS_HID_1209 = 0x1209,
-	BNXT_ULP_CLASS_HID_0d5d = 0x0d5d,
-	BNXT_ULP_CLASS_HID_0891 = 0x0891,
-	BNXT_ULP_CLASS_HID_03e5 = 0x03e5,
-	BNXT_ULP_CLASS_HID_3261 = 0x3261,
-	BNXT_ULP_CLASS_HID_2db5 = 0x2db5,
-	BNXT_ULP_CLASS_HID_2889 = 0x2889,
-	BNXT_ULP_CLASS_HID_23dd = 0x23dd,
+	BNXT_ULP_CLASS_HID_5c75 = 0x5c75,
 	BNXT_ULP_CLASS_HID_0bc1 = 0x0bc1,
-	BNXT_ULP_CLASS_HID_0715 = 0x0715,
-	BNXT_ULP_CLASS_HID_0269 = 0x0269,
-	BNXT_ULP_CLASS_HID_5a69 = 0x5a69,
-	BNXT_ULP_CLASS_HID_4895 = 0x4895,
-	BNXT_ULP_CLASS_HID_43e9 = 0x43e9,
-	BNXT_ULP_CLASS_HID_3f3d = 0x3f3d,
-	BNXT_ULP_CLASS_HID_3a71 = 0x3a71,
-	BNXT_ULP_CLASS_HID_0bcd = 0x0bcd,
-	BNXT_ULP_CLASS_HID_0701 = 0x0701,
-	BNXT_ULP_CLASS_HID_0255 = 0x0255,
-	BNXT_ULP_CLASS_HID_5a55 = 0x5a55,
-	BNXT_ULP_CLASS_HID_2c25 = 0x2c25,
-	BNXT_ULP_CLASS_HID_2779 = 0x2779,
-	BNXT_ULP_CLASS_HID_224d = 0x224d,
-	BNXT_ULP_CLASS_HID_1d81 = 0x1d81,
 	BNXT_ULP_CLASS_HID_0585 = 0x0585,
-	BNXT_ULP_CLASS_HID_00d9 = 0x00d9,
-	BNXT_ULP_CLASS_HID_58d9 = 0x58d9,
-	BNXT_ULP_CLASS_HID_542d = 0x542d,
-	BNXT_ULP_CLASS_HID_4259 = 0x4259,
-	BNXT_ULP_CLASS_HID_3dad = 0x3dad,
-	BNXT_ULP_CLASS_HID_38e1 = 0x38e1,
-	BNXT_ULP_CLASS_HID_3435 = 0x3435,
-	BNXT_ULP_CLASS_HID_05f1 = 0x05f1,
-	BNXT_ULP_CLASS_HID_00c5 = 0x00c5,
+	BNXT_ULP_CLASS_HID_121d = 0x121d,
 	BNXT_ULP_CLASS_HID_58c5 = 0x58c5,
-	BNXT_ULP_CLASS_HID_5419 = 0x5419,
-	BNXT_ULP_CLASS_HID_25e9 = 0x25e9,
-	BNXT_ULP_CLASS_HID_213d = 0x213d,
+	BNXT_ULP_CLASS_HID_0891 = 0x0891,
+	BNXT_ULP_CLASS_HID_0255 = 0x0255,
+	BNXT_ULP_CLASS_HID_0eed = 0x0eed,
 	BNXT_ULP_CLASS_HID_1c71 = 0x1c71,
-	BNXT_ULP_CLASS_HID_1745 = 0x1745,
-	BNXT_ULP_CLASS_HID_5c75 = 0x5c75,
-	BNXT_ULP_CLASS_HID_5749 = 0x5749,
-	BNXT_ULP_CLASS_HID_529d = 0x529d,
-	BNXT_ULP_CLASS_HID_4dd1 = 0x4dd1,
-	BNXT_ULP_CLASS_HID_3c1d = 0x3c1d,
-	BNXT_ULP_CLASS_HID_3751 = 0x3751,
+	BNXT_ULP_CLASS_HID_2889 = 0x2889,
+	BNXT_ULP_CLASS_HID_224d = 0x224d,
+	BNXT_ULP_CLASS_HID_2ec5 = 0x2ec5,
 	BNXT_ULP_CLASS_HID_32a5 = 0x32a5,
-	BNXT_ULP_CLASS_HID_2df9 = 0x2df9,
-	BNXT_ULP_CLASS_HID_4fe9 = 0x4fe9,
-	BNXT_ULP_CLASS_HID_4b3d = 0x4b3d,
-	BNXT_ULP_CLASS_HID_4671 = 0x4671,
-	BNXT_ULP_CLASS_HID_4145 = 0x4145,
-	BNXT_ULP_CLASS_HID_1315 = 0x1315,
-	BNXT_ULP_CLASS_HID_0e69 = 0x0e69,
-	BNXT_ULP_CLASS_HID_09bd = 0x09bd,
-	BNXT_ULP_CLASS_HID_04f1 = 0x04f1,
-	BNXT_ULP_CLASS_HID_49a1 = 0x49a1,
-	BNXT_ULP_CLASS_HID_44f5 = 0x44f5,
-	BNXT_ULP_CLASS_HID_3fc9 = 0x3fc9,
-	BNXT_ULP_CLASS_HID_3b1d = 0x3b1d,
-	BNXT_ULP_CLASS_HID_2949 = 0x2949,
-	BNXT_ULP_CLASS_HID_249d = 0x249d,
-	BNXT_ULP_CLASS_HID_1fd1 = 0x1fd1,
-	BNXT_ULP_CLASS_HID_1b25 = 0x1b25,
-	BNXT_ULP_CLASS_HID_49ad = 0x49ad,
-	BNXT_ULP_CLASS_HID_44e1 = 0x44e1,
-	BNXT_ULP_CLASS_HID_4035 = 0x4035,
-	BNXT_ULP_CLASS_HID_3b09 = 0x3b09,
-	BNXT_ULP_CLASS_HID_0cd9 = 0x0cd9,
-	BNXT_ULP_CLASS_HID_082d = 0x082d,
-	BNXT_ULP_CLASS_HID_0361 = 0x0361,
-	BNXT_ULP_CLASS_HID_5b61 = 0x5b61,
-	BNXT_ULP_CLASS_HID_4365 = 0x4365,
-	BNXT_ULP_CLASS_HID_3eb9 = 0x3eb9,
-	BNXT_ULP_CLASS_HID_398d = 0x398d,
-	BNXT_ULP_CLASS_HID_34c1 = 0x34c1,
-	BNXT_ULP_CLASS_HID_230d = 0x230d,
-	BNXT_ULP_CLASS_HID_1e41 = 0x1e41,
-	BNXT_ULP_CLASS_HID_1995 = 0x1995,
-	BNXT_ULP_CLASS_HID_14e9 = 0x14e9,
-	BNXT_ULP_CLASS_HID_2559 = 0x2559,
-	BNXT_ULP_CLASS_HID_2b95 = 0x2b95,
-	BNXT_ULP_CLASS_HID_4b8d = 0x4b8d,
-	BNXT_ULP_CLASS_HID_45b1 = 0x45b1,
+	BNXT_ULP_CLASS_HID_3f3d = 0x3f3d,
+	BNXT_ULP_CLASS_HID_38e1 = 0x38e1,
+	BNXT_ULP_CLASS_HID_4579 = 0x4579,
+	BNXT_ULP_CLASS_HID_529d = 0x529d,
+	BNXT_ULP_CLASS_HID_0269 = 0x0269,
+	BNXT_ULP_CLASS_HID_58d9 = 0x58d9,
+	BNXT_ULP_CLASS_HID_08a5 = 0x08a5,
+	BNXT_ULP_CLASS_HID_400c5 = 0x400c5,
+	BNXT_ULP_CLASS_HID_40d5d = 0x40d5d,
+	BNXT_ULP_CLASS_HID_40701 = 0x40701,
+	BNXT_ULP_CLASS_HID_41399 = 0x41399,
+	BNXT_ULP_CLASS_HID_4213d = 0x4213d,
+	BNXT_ULP_CLASS_HID_42db5 = 0x42db5,
+	BNXT_ULP_CLASS_HID_42779 = 0x42779,
+	BNXT_ULP_CLASS_HID_433f1 = 0x433f1,
+	BNXT_ULP_CLASS_HID_43751 = 0x43751,
+	BNXT_ULP_CLASS_HID_443e9 = 0x443e9,
+	BNXT_ULP_CLASS_HID_43dad = 0x43dad,
+	BNXT_ULP_CLASS_HID_44a25 = 0x44a25,
+	BNXT_ULP_CLASS_HID_45749 = 0x45749,
+	BNXT_ULP_CLASS_HID_40715 = 0x40715,
+	BNXT_ULP_CLASS_HID_400d9 = 0x400d9,
+	BNXT_ULP_CLASS_HID_40d51 = 0x40d51,
+	BNXT_ULP_CLASS_HID_45419 = 0x45419,
+	BNXT_ULP_CLASS_HID_403e5 = 0x403e5,
+	BNXT_ULP_CLASS_HID_45a55 = 0x45a55,
+	BNXT_ULP_CLASS_HID_40a21 = 0x40a21,
+	BNXT_ULP_CLASS_HID_41745 = 0x41745,
+	BNXT_ULP_CLASS_HID_423dd = 0x423dd,
+	BNXT_ULP_CLASS_HID_41d81 = 0x41d81,
+	BNXT_ULP_CLASS_HID_42a19 = 0x42a19,
+	BNXT_ULP_CLASS_HID_42df9 = 0x42df9,
+	BNXT_ULP_CLASS_HID_43a71 = 0x43a71,
+	BNXT_ULP_CLASS_HID_43435 = 0x43435,
+	BNXT_ULP_CLASS_HID_4404d = 0x4404d,
+	BNXT_ULP_CLASS_HID_44dd1 = 0x44dd1,
+	BNXT_ULP_CLASS_HID_45a69 = 0x45a69,
+	BNXT_ULP_CLASS_HID_4542d = 0x4542d,
+	BNXT_ULP_CLASS_HID_403f9 = 0x403f9,
+	BNXT_ULP_CLASS_HID_4140d = 0x4140d,
+	BNXT_ULP_CLASS_HID_420b5 = 0x420b5,
+	BNXT_ULP_CLASS_HID_41a49 = 0x41a49,
+	BNXT_ULP_CLASS_HID_426f1 = 0x426f1,
+	BNXT_ULP_CLASS_HID_44ab9 = 0x44ab9,
+	BNXT_ULP_CLASS_HID_45721 = 0x45721,
+	BNXT_ULP_CLASS_HID_450e5 = 0x450e5,
+	BNXT_ULP_CLASS_HID_40051 = 0x40051,
+	BNXT_ULP_CLASS_HID_40aa5 = 0x40aa5,
+	BNXT_ULP_CLASS_HID_4172d = 0x4172d,
+	BNXT_ULP_CLASS_HID_410e1 = 0x410e1,
+	BNXT_ULP_CLASS_HID_41d69 = 0x41d69,
+	BNXT_ULP_CLASS_HID_440d1 = 0x440d1,
+	BNXT_ULP_CLASS_HID_44d59 = 0x44d59,
+	BNXT_ULP_CLASS_HID_4471d = 0x4471d,
+	BNXT_ULP_CLASS_HID_45385 = 0x45385,
+	BNXT_ULP_CLASS_HID_6400d = 0x6400d,
+	BNXT_ULP_CLASS_HID_64cb5 = 0x64cb5,
+	BNXT_ULP_CLASS_HID_64649 = 0x64649,
+	BNXT_ULP_CLASS_HID_652f1 = 0x652f1,
+	BNXT_ULP_CLASS_HID_619ed = 0x619ed,
+	BNXT_ULP_CLASS_HID_62615 = 0x62615,
+	BNXT_ULP_CLASS_HID_62029 = 0x62029,
+	BNXT_ULP_CLASS_HID_62c51 = 0x62c51,
+	BNXT_ULP_CLASS_HID_636a5 = 0x636a5,
+	BNXT_ULP_CLASS_HID_6432d = 0x6432d,
+	BNXT_ULP_CLASS_HID_63ce1 = 0x63ce1,
+	BNXT_ULP_CLASS_HID_64969 = 0x64969,
+	BNXT_ULP_CLASS_HID_61005 = 0x61005,
+	BNXT_ULP_CLASS_HID_61c8d = 0x61c8d,
+	BNXT_ULP_CLASS_HID_61641 = 0x61641,
+	BNXT_ULP_CLASS_HID_622c9 = 0x622c9,
+	BNXT_ULP_CLASS_HID_52a0d = 0x52a0d,
+	BNXT_ULP_CLASS_HID_536b5 = 0x536b5,
+	BNXT_ULP_CLASS_HID_53049 = 0x53049,
+	BNXT_ULP_CLASS_HID_53cf1 = 0x53cf1,
+	BNXT_ULP_CLASS_HID_503ed = 0x503ed,
+	BNXT_ULP_CLASS_HID_51015 = 0x51015,
+	BNXT_ULP_CLASS_HID_50a29 = 0x50a29,
+	BNXT_ULP_CLASS_HID_51651 = 0x51651,
+	BNXT_ULP_CLASS_HID_520a5 = 0x520a5,
+	BNXT_ULP_CLASS_HID_52d2d = 0x52d2d,
+	BNXT_ULP_CLASS_HID_526e1 = 0x526e1,
+	BNXT_ULP_CLASS_HID_53369 = 0x53369,
+	BNXT_ULP_CLASS_HID_556d1 = 0x556d1,
+	BNXT_ULP_CLASS_HID_5068d = 0x5068d,
+	BNXT_ULP_CLASS_HID_50041 = 0x50041,
+	BNXT_ULP_CLASS_HID_50cc9 = 0x50cc9,
+	BNXT_ULP_CLASS_HID_7560d = 0x7560d,
+	BNXT_ULP_CLASS_HID_705f9 = 0x705f9,
+	BNXT_ULP_CLASS_HID_75c49 = 0x75c49,
+	BNXT_ULP_CLASS_HID_70c25 = 0x70c25,
+	BNXT_ULP_CLASS_HID_72fed = 0x72fed,
+	BNXT_ULP_CLASS_HID_73c15 = 0x73c15,
+	BNXT_ULP_CLASS_HID_73629 = 0x73629,
+	BNXT_ULP_CLASS_HID_74251 = 0x74251,
+	BNXT_ULP_CLASS_HID_74ca5 = 0x74ca5,
+	BNXT_ULP_CLASS_HID_7592d = 0x7592d,
+	BNXT_ULP_CLASS_HID_752e1 = 0x752e1,
+	BNXT_ULP_CLASS_HID_7025d = 0x7025d,
+	BNXT_ULP_CLASS_HID_72605 = 0x72605,
+	BNXT_ULP_CLASS_HID_7328d = 0x7328d,
+	BNXT_ULP_CLASS_HID_72c41 = 0x72c41,
+	BNXT_ULP_CLASS_HID_738c9 = 0x738c9,
+	BNXT_ULP_CLASS_HID_0591 = 0x0591,
+	BNXT_ULP_CLASS_HID_1269 = 0x1269,
+	BNXT_ULP_CLASS_HID_0bad = 0x0bad,
 	BNXT_ULP_CLASS_HID_1825 = 0x1825,
-	BNXT_ULP_CLASS_HID_13f9 = 0x13f9,
-	BNXT_ULP_CLASS_HID_0e8d = 0x0e8d,
-	BNXT_ULP_CLASS_HID_0a41 = 0x0a41,
+	BNXT_ULP_CLASS_HID_2589 = 0x2589,
+	BNXT_ULP_CLASS_HID_3201 = 0x3201,
+	BNXT_ULP_CLASS_HID_2c45 = 0x2c45,
 	BNXT_ULP_CLASS_HID_38dd = 0x38dd,
-	BNXT_ULP_CLASS_HID_3391 = 0x3391,
-	BNXT_ULP_CLASS_HID_2ea5 = 0x2ea5,
-	BNXT_ULP_CLASS_HID_2a79 = 0x2a79,
-	BNXT_ULP_CLASS_HID_127d = 0x127d,
-	BNXT_ULP_CLASS_HID_0d31 = 0x0d31,
-	BNXT_ULP_CLASS_HID_08c5 = 0x08c5,
-	BNXT_ULP_CLASS_HID_0399 = 0x0399,
+	BNXT_ULP_CLASS_HID_3c7d = 0x3c7d,
+	BNXT_ULP_CLASS_HID_48f5 = 0x48f5,
+	BNXT_ULP_CLASS_HID_4239 = 0x4239,
 	BNXT_ULP_CLASS_HID_4eb1 = 0x4eb1,
-	BNXT_ULP_CLASS_HID_4a45 = 0x4a45,
-	BNXT_ULP_CLASS_HID_4519 = 0x4519,
-	BNXT_ULP_CLASS_HID_402d = 0x402d,
-	BNXT_ULP_CLASS_HID_1269 = 0x1269,
-	BNXT_ULP_CLASS_HID_0d3d = 0x0d3d,
-	BNXT_ULP_CLASS_HID_08f1 = 0x08f1,
-	BNXT_ULP_CLASS_HID_0385 = 0x0385,
-	BNXT_ULP_CLASS_HID_3201 = 0x3201,
-	BNXT_ULP_CLASS_HID_2dd5 = 0x2dd5,
-	BNXT_ULP_CLASS_HID_28e9 = 0x28e9,
-	BNXT_ULP_CLASS_HID_23bd = 0x23bd,
+	BNXT_ULP_CLASS_HID_5c15 = 0x5c15,
 	BNXT_ULP_CLASS_HID_0ba1 = 0x0ba1,
-	BNXT_ULP_CLASS_HID_0775 = 0x0775,
-	BNXT_ULP_CLASS_HID_0209 = 0x0209,
-	BNXT_ULP_CLASS_HID_5a09 = 0x5a09,
-	BNXT_ULP_CLASS_HID_48f5 = 0x48f5,
-	BNXT_ULP_CLASS_HID_4389 = 0x4389,
-	BNXT_ULP_CLASS_HID_3f5d = 0x3f5d,
-	BNXT_ULP_CLASS_HID_3a11 = 0x3a11,
-	BNXT_ULP_CLASS_HID_0bad = 0x0bad,
-	BNXT_ULP_CLASS_HID_0761 = 0x0761,
-	BNXT_ULP_CLASS_HID_0235 = 0x0235,
-	BNXT_ULP_CLASS_HID_5a35 = 0x5a35,
-	BNXT_ULP_CLASS_HID_2c45 = 0x2c45,
-	BNXT_ULP_CLASS_HID_2719 = 0x2719,
-	BNXT_ULP_CLASS_HID_222d = 0x222d,
-	BNXT_ULP_CLASS_HID_1de1 = 0x1de1,
 	BNXT_ULP_CLASS_HID_05e5 = 0x05e5,
-	BNXT_ULP_CLASS_HID_00b9 = 0x00b9,
-	BNXT_ULP_CLASS_HID_58b9 = 0x58b9,
-	BNXT_ULP_CLASS_HID_544d = 0x544d,
-	BNXT_ULP_CLASS_HID_4239 = 0x4239,
-	BNXT_ULP_CLASS_HID_3dcd = 0x3dcd,
-	BNXT_ULP_CLASS_HID_3881 = 0x3881,
-	BNXT_ULP_CLASS_HID_3455 = 0x3455,
-	BNXT_ULP_CLASS_HID_0591 = 0x0591,
-	BNXT_ULP_CLASS_HID_00a5 = 0x00a5,
+	BNXT_ULP_CLASS_HID_127d = 0x127d,
 	BNXT_ULP_CLASS_HID_58a5 = 0x58a5,
-	BNXT_ULP_CLASS_HID_5479 = 0x5479,
-	BNXT_ULP_CLASS_HID_2589 = 0x2589,
-	BNXT_ULP_CLASS_HID_215d = 0x215d,
+	BNXT_ULP_CLASS_HID_08f1 = 0x08f1,
+	BNXT_ULP_CLASS_HID_0235 = 0x0235,
+	BNXT_ULP_CLASS_HID_0e8d = 0x0e8d,
 	BNXT_ULP_CLASS_HID_1c11 = 0x1c11,
-	BNXT_ULP_CLASS_HID_1725 = 0x1725,
-	BNXT_ULP_CLASS_HID_5c15 = 0x5c15,
-	BNXT_ULP_CLASS_HID_5729 = 0x5729,
-	BNXT_ULP_CLASS_HID_52fd = 0x52fd,
-	BNXT_ULP_CLASS_HID_4db1 = 0x4db1,
-	BNXT_ULP_CLASS_HID_3c7d = 0x3c7d,
-	BNXT_ULP_CLASS_HID_3731 = 0x3731,
+	BNXT_ULP_CLASS_HID_28e9 = 0x28e9,
+	BNXT_ULP_CLASS_HID_222d = 0x222d,
+	BNXT_ULP_CLASS_HID_2ea5 = 0x2ea5,
 	BNXT_ULP_CLASS_HID_32c5 = 0x32c5,
-	BNXT_ULP_CLASS_HID_2d99 = 0x2d99,
-	BNXT_ULP_CLASS_HID_4f89 = 0x4f89,
-	BNXT_ULP_CLASS_HID_4b5d = 0x4b5d,
-	BNXT_ULP_CLASS_HID_4611 = 0x4611,
-	BNXT_ULP_CLASS_HID_4125 = 0x4125,
-	BNXT_ULP_CLASS_HID_1375 = 0x1375,
-	BNXT_ULP_CLASS_HID_0e09 = 0x0e09,
-	BNXT_ULP_CLASS_HID_09dd = 0x09dd,
-	BNXT_ULP_CLASS_HID_0491 = 0x0491,
-	BNXT_ULP_CLASS_HID_49c1 = 0x49c1,
-	BNXT_ULP_CLASS_HID_4495 = 0x4495,
-	BNXT_ULP_CLASS_HID_3fa9 = 0x3fa9,
-	BNXT_ULP_CLASS_HID_3b7d = 0x3b7d,
-	BNXT_ULP_CLASS_HID_2929 = 0x2929,
-	BNXT_ULP_CLASS_HID_24fd = 0x24fd,
-	BNXT_ULP_CLASS_HID_1fb1 = 0x1fb1,
-	BNXT_ULP_CLASS_HID_1b45 = 0x1b45,
-	BNXT_ULP_CLASS_HID_49cd = 0x49cd,
-	BNXT_ULP_CLASS_HID_4481 = 0x4481,
-	BNXT_ULP_CLASS_HID_4055 = 0x4055,
-	BNXT_ULP_CLASS_HID_3b69 = 0x3b69,
-	BNXT_ULP_CLASS_HID_0cb9 = 0x0cb9,
-	BNXT_ULP_CLASS_HID_084d = 0x084d,
-	BNXT_ULP_CLASS_HID_0301 = 0x0301,
-	BNXT_ULP_CLASS_HID_5b01 = 0x5b01,
-	BNXT_ULP_CLASS_HID_4305 = 0x4305,
-	BNXT_ULP_CLASS_HID_3ed9 = 0x3ed9,
-	BNXT_ULP_CLASS_HID_39ed = 0x39ed,
-	BNXT_ULP_CLASS_HID_34a1 = 0x34a1,
-	BNXT_ULP_CLASS_HID_236d = 0x236d,
-	BNXT_ULP_CLASS_HID_1e21 = 0x1e21,
-	BNXT_ULP_CLASS_HID_19f5 = 0x19f5,
-	BNXT_ULP_CLASS_HID_1489 = 0x1489,
-	BNXT_ULP_CLASS_HID_2539 = 0x2539,
-	BNXT_ULP_CLASS_HID_2bf5 = 0x2bf5,
-	BNXT_ULP_CLASS_HID_4bed = 0x4bed,
-	BNXT_ULP_CLASS_HID_45d1 = 0x45d1,
-	BNXT_ULP_CLASS_HID_b6af = 0xb6af,
-	BNXT_ULP_CLASS_HID_b1d3 = 0xb1d3,
-	BNXT_ULP_CLASS_HID_1c7d3 = 0x1c7d3,
-	BNXT_ULP_CLASS_HID_1ccaf = 0x1ccaf,
-	BNXT_ULP_CLASS_HID_da33 = 0xda33,
-	BNXT_ULP_CLASS_HID_d567 = 0xd567,
-	BNXT_ULP_CLASS_HID_18eab = 0x18eab,
-	BNXT_ULP_CLASS_HID_19367 = 0x19367,
-	BNXT_ULP_CLASS_HID_a10b = 0xa10b,
-	BNXT_ULP_CLASS_HID_9c3f = 0x9c3f,
-	BNXT_ULP_CLASS_HID_1b23f = 0x1b23f,
-	BNXT_ULP_CLASS_HID_1b70b = 0x1b70b,
-	BNXT_ULP_CLASS_HID_c49f = 0xc49f,
-	BNXT_ULP_CLASS_HID_bfc3 = 0xbfc3,
-	BNXT_ULP_CLASS_HID_1d5c3 = 0x1d5c3,
-	BNXT_ULP_CLASS_HID_1da9f = 0x1da9f,
-	BNXT_ULP_CLASS_HID_b063 = 0xb063,
-	BNXT_ULP_CLASS_HID_ab97 = 0xab97,
-	BNXT_ULP_CLASS_HID_1c197 = 0x1c197,
-	BNXT_ULP_CLASS_HID_1c663 = 0x1c663,
-	BNXT_ULP_CLASS_HID_d3f7 = 0xd3f7,
-	BNXT_ULP_CLASS_HID_cf3b = 0xcf3b,
-	BNXT_ULP_CLASS_HID_1886f = 0x1886f,
-	BNXT_ULP_CLASS_HID_18d3b = 0x18d3b,
-	BNXT_ULP_CLASS_HID_9acf = 0x9acf,
-	BNXT_ULP_CLASS_HID_95f3 = 0x95f3,
-	BNXT_ULP_CLASS_HID_1abf3 = 0x1abf3,
-	BNXT_ULP_CLASS_HID_1b0cf = 0x1b0cf,
-	BNXT_ULP_CLASS_HID_be53 = 0xbe53,
-	BNXT_ULP_CLASS_HID_b987 = 0xb987,
-	BNXT_ULP_CLASS_HID_1cf87 = 0x1cf87,
-	BNXT_ULP_CLASS_HID_1d453 = 0x1d453,
-	BNXT_ULP_CLASS_HID_aa27 = 0xaa27,
-	BNXT_ULP_CLASS_HID_a56b = 0xa56b,
-	BNXT_ULP_CLASS_HID_1bb6b = 0x1bb6b,
-	BNXT_ULP_CLASS_HID_1c027 = 0x1c027,
-	BNXT_ULP_CLASS_HID_cdcb = 0xcdcb,
-	BNXT_ULP_CLASS_HID_c8ff = 0xc8ff,
-	BNXT_ULP_CLASS_HID_18223 = 0x18223,
-	BNXT_ULP_CLASS_HID_186ff = 0x186ff,
-	BNXT_ULP_CLASS_HID_9483 = 0x9483,
-	BNXT_ULP_CLASS_HID_8fb7 = 0x8fb7,
-	BNXT_ULP_CLASS_HID_1a5b7 = 0x1a5b7,
-	BNXT_ULP_CLASS_HID_1aa83 = 0x1aa83,
-	BNXT_ULP_CLASS_HID_b817 = 0xb817,
-	BNXT_ULP_CLASS_HID_b35b = 0xb35b,
-	BNXT_ULP_CLASS_HID_1c95b = 0x1c95b,
-	BNXT_ULP_CLASS_HID_1ce17 = 0x1ce17,
-	BNXT_ULP_CLASS_HID_a3fb = 0xa3fb,
-	BNXT_ULP_CLASS_HID_9f2f = 0x9f2f,
-	BNXT_ULP_CLASS_HID_1b52f = 0x1b52f,
-	BNXT_ULP_CLASS_HID_1b9fb = 0x1b9fb,
-	BNXT_ULP_CLASS_HID_c78f = 0xc78f,
-	BNXT_ULP_CLASS_HID_c2b3 = 0xc2b3,
-	BNXT_ULP_CLASS_HID_1d8b3 = 0x1d8b3,
-	BNXT_ULP_CLASS_HID_180b3 = 0x180b3,
-	BNXT_ULP_CLASS_HID_8e47 = 0x8e47,
-	BNXT_ULP_CLASS_HID_898b = 0x898b,
-	BNXT_ULP_CLASS_HID_19f8b = 0x19f8b,
-	BNXT_ULP_CLASS_HID_1a447 = 0x1a447,
-	BNXT_ULP_CLASS_HID_b1eb = 0xb1eb,
-	BNXT_ULP_CLASS_HID_ad1f = 0xad1f,
-	BNXT_ULP_CLASS_HID_1c31f = 0x1c31f,
-	BNXT_ULP_CLASS_HID_1c7eb = 0x1c7eb,
-	BNXT_ULP_CLASS_HID_9137 = 0x9137,
-	BNXT_ULP_CLASS_HID_8c7b = 0x8c7b,
-	BNXT_ULP_CLASS_HID_1a27b = 0x1a27b,
-	BNXT_ULP_CLASS_HID_1a737 = 0x1a737,
-	BNXT_ULP_CLASS_HID_b4db = 0xb4db,
-	BNXT_ULP_CLASS_HID_b00f = 0xb00f,
-	BNXT_ULP_CLASS_HID_1c60f = 0x1c60f,
-	BNXT_ULP_CLASS_HID_1cadb = 0x1cadb,
-	BNXT_ULP_CLASS_HID_8b0b = 0x8b0b,
-	BNXT_ULP_CLASS_HID_863f = 0x863f,
-	BNXT_ULP_CLASS_HID_19c3f = 0x19c3f,
-	BNXT_ULP_CLASS_HID_1a10b = 0x1a10b,
-	BNXT_ULP_CLASS_HID_ae9f = 0xae9f,
-	BNXT_ULP_CLASS_HID_a9c3 = 0xa9c3,
-	BNXT_ULP_CLASS_HID_1bfc3 = 0x1bfc3,
-	BNXT_ULP_CLASS_HID_1c49f = 0x1c49f,
-	BNXT_ULP_CLASS_HID_2563 = 0x2563,
-	BNXT_ULP_CLASS_HID_2baf = 0x2baf,
-	BNXT_ULP_CLASS_HID_26d3 = 0x26d3,
-	BNXT_ULP_CLASS_HID_4f33 = 0x4f33,
-	BNXT_ULP_CLASS_HID_4a67 = 0x4a67,
-	BNXT_ULP_CLASS_HID_160b = 0x160b,
-	BNXT_ULP_CLASS_HID_113f = 0x113f,
-	BNXT_ULP_CLASS_HID_399f = 0x399f,
-	BNXT_ULP_CLASS_HID_34c3 = 0x34c3,
-	BNXT_ULP_CLASS_HID_2097 = 0x2097,
-	BNXT_ULP_CLASS_HID_48f7 = 0x48f7,
-	BNXT_ULP_CLASS_HID_443b = 0x443b,
-	BNXT_ULP_CLASS_HID_0fcf = 0x0fcf,
-	BNXT_ULP_CLASS_HID_0af3 = 0x0af3,
-	BNXT_ULP_CLASS_HID_3353 = 0x3353,
-	BNXT_ULP_CLASS_HID_2e87 = 0x2e87,
+	BNXT_ULP_CLASS_HID_3f5d = 0x3f5d,
+	BNXT_ULP_CLASS_HID_3881 = 0x3881,
+	BNXT_ULP_CLASS_HID_4519 = 0x4519,
+	BNXT_ULP_CLASS_HID_52fd = 0x52fd,
+	BNXT_ULP_CLASS_HID_0209 = 0x0209,
+	BNXT_ULP_CLASS_HID_58b9 = 0x58b9,
+	BNXT_ULP_CLASS_HID_08c5 = 0x08c5,
+	BNXT_ULP_CLASS_HID_400a5 = 0x400a5,
+	BNXT_ULP_CLASS_HID_40d3d = 0x40d3d,
+	BNXT_ULP_CLASS_HID_40761 = 0x40761,
+	BNXT_ULP_CLASS_HID_413f9 = 0x413f9,
+	BNXT_ULP_CLASS_HID_4215d = 0x4215d,
+	BNXT_ULP_CLASS_HID_42dd5 = 0x42dd5,
+	BNXT_ULP_CLASS_HID_42719 = 0x42719,
+	BNXT_ULP_CLASS_HID_43391 = 0x43391,
+	BNXT_ULP_CLASS_HID_43731 = 0x43731,
+	BNXT_ULP_CLASS_HID_44389 = 0x44389,
+	BNXT_ULP_CLASS_HID_43dcd = 0x43dcd,
+	BNXT_ULP_CLASS_HID_44a45 = 0x44a45,
+	BNXT_ULP_CLASS_HID_45729 = 0x45729,
+	BNXT_ULP_CLASS_HID_40775 = 0x40775,
+	BNXT_ULP_CLASS_HID_400b9 = 0x400b9,
+	BNXT_ULP_CLASS_HID_40d31 = 0x40d31,
+	BNXT_ULP_CLASS_HID_45479 = 0x45479,
+	BNXT_ULP_CLASS_HID_40385 = 0x40385,
+	BNXT_ULP_CLASS_HID_45a35 = 0x45a35,
+	BNXT_ULP_CLASS_HID_40a41 = 0x40a41,
+	BNXT_ULP_CLASS_HID_41725 = 0x41725,
+	BNXT_ULP_CLASS_HID_423bd = 0x423bd,
+	BNXT_ULP_CLASS_HID_41de1 = 0x41de1,
+	BNXT_ULP_CLASS_HID_42a79 = 0x42a79,
+	BNXT_ULP_CLASS_HID_42d99 = 0x42d99,
+	BNXT_ULP_CLASS_HID_43a11 = 0x43a11,
+	BNXT_ULP_CLASS_HID_43455 = 0x43455,
+	BNXT_ULP_CLASS_HID_4402d = 0x4402d,
+	BNXT_ULP_CLASS_HID_44db1 = 0x44db1,
+	BNXT_ULP_CLASS_HID_45a09 = 0x45a09,
+	BNXT_ULP_CLASS_HID_4544d = 0x4544d,
+	BNXT_ULP_CLASS_HID_40399 = 0x40399,
+	BNXT_ULP_CLASS_HID_4146d = 0x4146d,
+	BNXT_ULP_CLASS_HID_420d5 = 0x420d5,
+	BNXT_ULP_CLASS_HID_41a29 = 0x41a29,
+	BNXT_ULP_CLASS_HID_42691 = 0x42691,
+	BNXT_ULP_CLASS_HID_44ad9 = 0x44ad9,
+	BNXT_ULP_CLASS_HID_45741 = 0x45741,
+	BNXT_ULP_CLASS_HID_45085 = 0x45085,
+	BNXT_ULP_CLASS_HID_40031 = 0x40031,
+	BNXT_ULP_CLASS_HID_40ac5 = 0x40ac5,
+	BNXT_ULP_CLASS_HID_4174d = 0x4174d,
+	BNXT_ULP_CLASS_HID_41081 = 0x41081,
+	BNXT_ULP_CLASS_HID_41d09 = 0x41d09,
+	BNXT_ULP_CLASS_HID_440b1 = 0x440b1,
+	BNXT_ULP_CLASS_HID_44d39 = 0x44d39,
+	BNXT_ULP_CLASS_HID_4477d = 0x4477d,
+	BNXT_ULP_CLASS_HID_453e5 = 0x453e5,
+	BNXT_ULP_CLASS_HID_6406d = 0x6406d,
+	BNXT_ULP_CLASS_HID_64cd5 = 0x64cd5,
+	BNXT_ULP_CLASS_HID_64629 = 0x64629,
+	BNXT_ULP_CLASS_HID_65291 = 0x65291,
+	BNXT_ULP_CLASS_HID_6198d = 0x6198d,
+	BNXT_ULP_CLASS_HID_62675 = 0x62675,
+	BNXT_ULP_CLASS_HID_62049 = 0x62049,
+	BNXT_ULP_CLASS_HID_62c31 = 0x62c31,
+	BNXT_ULP_CLASS_HID_636c5 = 0x636c5,
+	BNXT_ULP_CLASS_HID_6434d = 0x6434d,
+	BNXT_ULP_CLASS_HID_63c81 = 0x63c81,
+	BNXT_ULP_CLASS_HID_64909 = 0x64909,
+	BNXT_ULP_CLASS_HID_61065 = 0x61065,
+	BNXT_ULP_CLASS_HID_61ced = 0x61ced,
+	BNXT_ULP_CLASS_HID_61621 = 0x61621,
+	BNXT_ULP_CLASS_HID_622a9 = 0x622a9,
+	BNXT_ULP_CLASS_HID_52a6d = 0x52a6d,
+	BNXT_ULP_CLASS_HID_536d5 = 0x536d5,
+	BNXT_ULP_CLASS_HID_53029 = 0x53029,
+	BNXT_ULP_CLASS_HID_53c91 = 0x53c91,
+	BNXT_ULP_CLASS_HID_5038d = 0x5038d,
+	BNXT_ULP_CLASS_HID_51075 = 0x51075,
+	BNXT_ULP_CLASS_HID_50a49 = 0x50a49,
+	BNXT_ULP_CLASS_HID_51631 = 0x51631,
+	BNXT_ULP_CLASS_HID_520c5 = 0x520c5,
+	BNXT_ULP_CLASS_HID_52d4d = 0x52d4d,
+	BNXT_ULP_CLASS_HID_52681 = 0x52681,
+	BNXT_ULP_CLASS_HID_53309 = 0x53309,
+	BNXT_ULP_CLASS_HID_556b1 = 0x556b1,
+	BNXT_ULP_CLASS_HID_506ed = 0x506ed,
+	BNXT_ULP_CLASS_HID_50021 = 0x50021,
+	BNXT_ULP_CLASS_HID_50ca9 = 0x50ca9,
+	BNXT_ULP_CLASS_HID_7566d = 0x7566d,
+	BNXT_ULP_CLASS_HID_70599 = 0x70599,
+	BNXT_ULP_CLASS_HID_75c29 = 0x75c29,
+	BNXT_ULP_CLASS_HID_70c45 = 0x70c45,
+	BNXT_ULP_CLASS_HID_72f8d = 0x72f8d,
+	BNXT_ULP_CLASS_HID_73c75 = 0x73c75,
+	BNXT_ULP_CLASS_HID_73649 = 0x73649,
+	BNXT_ULP_CLASS_HID_74231 = 0x74231,
+	BNXT_ULP_CLASS_HID_74cc5 = 0x74cc5,
+	BNXT_ULP_CLASS_HID_7594d = 0x7594d,
+	BNXT_ULP_CLASS_HID_75281 = 0x75281,
+	BNXT_ULP_CLASS_HID_7023d = 0x7023d,
+	BNXT_ULP_CLASS_HID_72665 = 0x72665,
+	BNXT_ULP_CLASS_HID_732ed = 0x732ed,
+	BNXT_ULP_CLASS_HID_72c21 = 0x72c21,
+	BNXT_ULP_CLASS_HID_738a9 = 0x738a9,
+	BNXT_ULP_CLASS_HID_244c3 = 0x244c3,
+	BNXT_ULP_CLASS_HID_2515b = 0x2515b,
+	BNXT_ULP_CLASS_HID_24b1f = 0x24b1f,
+	BNXT_ULP_CLASS_HID_25797 = 0x25797,
+	BNXT_ULP_CLASS_HID_22f7f = 0x22f7f,
+	BNXT_ULP_CLASS_HID_23bf7 = 0x23bf7,
+	BNXT_ULP_CLASS_HID_235bb = 0x235bb,
+	BNXT_ULP_CLASS_HID_24233 = 0x24233,
+	BNXT_ULP_CLASS_HID_20b8b = 0x20b8b,
+	BNXT_ULP_CLASS_HID_21803 = 0x21803,
+	BNXT_ULP_CLASS_HID_211c7 = 0x211c7,
+	BNXT_ULP_CLASS_HID_21e5f = 0x21e5f,
+	BNXT_ULP_CLASS_HID_252d3 = 0x252d3,
+	BNXT_ULP_CLASS_HID_202bf = 0x202bf,
+	BNXT_ULP_CLASS_HID_2592f = 0x2592f,
+	BNXT_ULP_CLASS_HID_208fb = 0x208fb,
+	BNXT_ULP_CLASS_HID_231f3 = 0x231f3,
+	BNXT_ULP_CLASS_HID_23e0b = 0x23e0b,
+	BNXT_ULP_CLASS_HID_237cf = 0x237cf,
+	BNXT_ULP_CLASS_HID_24447 = 0x24447,
+	BNXT_ULP_CLASS_HID_21c2f = 0x21c2f,
+	BNXT_ULP_CLASS_HID_228a7 = 0x228a7,
+	BNXT_ULP_CLASS_HID_2226b = 0x2226b,
+	BNXT_ULP_CLASS_HID_22ee3 = 0x22ee3,
+	BNXT_ULP_CLASS_HID_25567 = 0x25567,
+	BNXT_ULP_CLASS_HID_20533 = 0x20533,
+	BNXT_ULP_CLASS_HID_25ba3 = 0x25ba3,
+	BNXT_ULP_CLASS_HID_20b0f = 0x20b0f,
+	BNXT_ULP_CLASS_HID_23f83 = 0x23f83,
+	BNXT_ULP_CLASS_HID_24c1b = 0x24c1b,
+	BNXT_ULP_CLASS_HID_245df = 0x245df,
+	BNXT_ULP_CLASS_HID_25257 = 0x25257,
+	BNXT_ULP_CLASS_HID_64017 = 0x64017,
+	BNXT_ULP_CLASS_HID_64caf = 0x64caf,
+	BNXT_ULP_CLASS_HID_64653 = 0x64653,
+	BNXT_ULP_CLASS_HID_652eb = 0x652eb,
+	BNXT_ULP_CLASS_HID_62ab3 = 0x62ab3,
+	BNXT_ULP_CLASS_HID_636cb = 0x636cb,
+	BNXT_ULP_CLASS_HID_6308f = 0x6308f,
+	BNXT_ULP_CLASS_HID_63d07 = 0x63d07,
+	BNXT_ULP_CLASS_HID_606df = 0x606df,
+	BNXT_ULP_CLASS_HID_61357 = 0x61357,
+	BNXT_ULP_CLASS_HID_60d1b = 0x60d1b,
+	BNXT_ULP_CLASS_HID_61993 = 0x61993,
+	BNXT_ULP_CLASS_HID_64e27 = 0x64e27,
+	BNXT_ULP_CLASS_HID_65abf = 0x65abf,
+	BNXT_ULP_CLASS_HID_65463 = 0x65463,
+	BNXT_ULP_CLASS_HID_603cf = 0x603cf,
+	BNXT_ULP_CLASS_HID_62cc7 = 0x62cc7,
+	BNXT_ULP_CLASS_HID_6395f = 0x6395f,
+	BNXT_ULP_CLASS_HID_63303 = 0x63303,
+	BNXT_ULP_CLASS_HID_63f9b = 0x63f9b,
+	BNXT_ULP_CLASS_HID_61763 = 0x61763,
+	BNXT_ULP_CLASS_HID_623fb = 0x623fb,
+	BNXT_ULP_CLASS_HID_61dbf = 0x61dbf,
+	BNXT_ULP_CLASS_HID_62a37 = 0x62a37,
+	BNXT_ULP_CLASS_HID_650bb = 0x650bb,
+	BNXT_ULP_CLASS_HID_60007 = 0x60007,
+	BNXT_ULP_CLASS_HID_656f7 = 0x656f7,
+	BNXT_ULP_CLASS_HID_60643 = 0x60643,
+	BNXT_ULP_CLASS_HID_63ad7 = 0x63ad7,
+	BNXT_ULP_CLASS_HID_6476f = 0x6476f,
+	BNXT_ULP_CLASS_HID_64113 = 0x64113,
+	BNXT_ULP_CLASS_HID_64dab = 0x64dab,
+	BNXT_ULP_CLASS_HID_35ac3 = 0x35ac3,
+	BNXT_ULP_CLASS_HID_30aaf = 0x30aaf,
+	BNXT_ULP_CLASS_HID_30453 = 0x30453,
+	BNXT_ULP_CLASS_HID_310eb = 0x310eb,
+	BNXT_ULP_CLASS_HID_3457f = 0x3457f,
+	BNXT_ULP_CLASS_HID_351f7 = 0x351f7,
+	BNXT_ULP_CLASS_HID_34bbb = 0x34bbb,
+	BNXT_ULP_CLASS_HID_35833 = 0x35833,
+	BNXT_ULP_CLASS_HID_3218b = 0x3218b,
+	BNXT_ULP_CLASS_HID_32e03 = 0x32e03,
+	BNXT_ULP_CLASS_HID_327c7 = 0x327c7,
+	BNXT_ULP_CLASS_HID_3345f = 0x3345f,
+	BNXT_ULP_CLASS_HID_30c27 = 0x30c27,
+	BNXT_ULP_CLASS_HID_318bf = 0x318bf,
+	BNXT_ULP_CLASS_HID_31263 = 0x31263,
+	BNXT_ULP_CLASS_HID_31efb = 0x31efb,
+	BNXT_ULP_CLASS_HID_347f3 = 0x347f3,
+	BNXT_ULP_CLASS_HID_3540b = 0x3540b,
+	BNXT_ULP_CLASS_HID_34dcf = 0x34dcf,
+	BNXT_ULP_CLASS_HID_35a47 = 0x35a47,
+	BNXT_ULP_CLASS_HID_3322f = 0x3322f,
+	BNXT_ULP_CLASS_HID_33ea7 = 0x33ea7,
+	BNXT_ULP_CLASS_HID_3386b = 0x3386b,
+	BNXT_ULP_CLASS_HID_344e3 = 0x344e3,
+	BNXT_ULP_CLASS_HID_30ebb = 0x30ebb,
+	BNXT_ULP_CLASS_HID_31b33 = 0x31b33,
+	BNXT_ULP_CLASS_HID_314f7 = 0x314f7,
+	BNXT_ULP_CLASS_HID_3210f = 0x3210f,
+	BNXT_ULP_CLASS_HID_35583 = 0x35583,
+	BNXT_ULP_CLASS_HID_3056f = 0x3056f,
+	BNXT_ULP_CLASS_HID_35bdf = 0x35bdf,
+	BNXT_ULP_CLASS_HID_30bab = 0x30bab,
+	BNXT_ULP_CLASS_HID_75617 = 0x75617,
+	BNXT_ULP_CLASS_HID_705e3 = 0x705e3,
+	BNXT_ULP_CLASS_HID_75c53 = 0x75c53,
+	BNXT_ULP_CLASS_HID_70c3f = 0x70c3f,
+	BNXT_ULP_CLASS_HID_740b3 = 0x740b3,
+	BNXT_ULP_CLASS_HID_74ccb = 0x74ccb,
+	BNXT_ULP_CLASS_HID_7468f = 0x7468f,
+	BNXT_ULP_CLASS_HID_75307 = 0x75307,
+	BNXT_ULP_CLASS_HID_71cdf = 0x71cdf,
+	BNXT_ULP_CLASS_HID_72957 = 0x72957,
+	BNXT_ULP_CLASS_HID_7231b = 0x7231b,
+	BNXT_ULP_CLASS_HID_72f93 = 0x72f93,
+	BNXT_ULP_CLASS_HID_7077b = 0x7077b,
+	BNXT_ULP_CLASS_HID_713f3 = 0x713f3,
+	BNXT_ULP_CLASS_HID_70db7 = 0x70db7,
+	BNXT_ULP_CLASS_HID_719cf = 0x719cf,
+	BNXT_ULP_CLASS_HID_742c7 = 0x742c7,
+	BNXT_ULP_CLASS_HID_74f5f = 0x74f5f,
+	BNXT_ULP_CLASS_HID_74903 = 0x74903,
+	BNXT_ULP_CLASS_HID_7559b = 0x7559b,
+	BNXT_ULP_CLASS_HID_72d63 = 0x72d63,
+	BNXT_ULP_CLASS_HID_739fb = 0x739fb,
+	BNXT_ULP_CLASS_HID_733bf = 0x733bf,
+	BNXT_ULP_CLASS_HID_74037 = 0x74037,
+	BNXT_ULP_CLASS_HID_7098f = 0x7098f,
+	BNXT_ULP_CLASS_HID_71607 = 0x71607,
+	BNXT_ULP_CLASS_HID_70fcb = 0x70fcb,
+	BNXT_ULP_CLASS_HID_71c43 = 0x71c43,
+	BNXT_ULP_CLASS_HID_750d7 = 0x750d7,
+	BNXT_ULP_CLASS_HID_700a3 = 0x700a3,
+	BNXT_ULP_CLASS_HID_75713 = 0x75713,
+	BNXT_ULP_CLASS_HID_706ff = 0x706ff,
+	BNXT_ULP_CLASS_HID_2cfc3 = 0x2cfc3,
+	BNXT_ULP_CLASS_HID_2dc5b = 0x2dc5b,
+	BNXT_ULP_CLASS_HID_2d61f = 0x2d61f,
+	BNXT_ULP_CLASS_HID_285eb = 0x285eb,
+	BNXT_ULP_CLASS_HID_2ba7f = 0x2ba7f,
+	BNXT_ULP_CLASS_HID_2c6f7 = 0x2c6f7,
+	BNXT_ULP_CLASS_HID_2c0bb = 0x2c0bb,
+	BNXT_ULP_CLASS_HID_2cd33 = 0x2cd33,
+	BNXT_ULP_CLASS_HID_2968b = 0x2968b,
+	BNXT_ULP_CLASS_HID_2a303 = 0x2a303,
+	BNXT_ULP_CLASS_HID_29cc7 = 0x29cc7,
+	BNXT_ULP_CLASS_HID_2a95f = 0x2a95f,
+	BNXT_ULP_CLASS_HID_28127 = 0x28127,
+	BNXT_ULP_CLASS_HID_28dbf = 0x28dbf,
+	BNXT_ULP_CLASS_HID_28763 = 0x28763,
+	BNXT_ULP_CLASS_HID_293fb = 0x293fb,
+	BNXT_ULP_CLASS_HID_2bcf3 = 0x2bcf3,
+	BNXT_ULP_CLASS_HID_2c90b = 0x2c90b,
+	BNXT_ULP_CLASS_HID_2c2cf = 0x2c2cf,
+	BNXT_ULP_CLASS_HID_2cf47 = 0x2cf47,
+	BNXT_ULP_CLASS_HID_2a72f = 0x2a72f,
+	BNXT_ULP_CLASS_HID_2b3a7 = 0x2b3a7,
+	BNXT_ULP_CLASS_HID_2ad6b = 0x2ad6b,
+	BNXT_ULP_CLASS_HID_2b9e3 = 0x2b9e3,
+	BNXT_ULP_CLASS_HID_283bb = 0x283bb,
+	BNXT_ULP_CLASS_HID_29033 = 0x29033,
+	BNXT_ULP_CLASS_HID_289f7 = 0x289f7,
+	BNXT_ULP_CLASS_HID_2960f = 0x2960f,
+	BNXT_ULP_CLASS_HID_2ca83 = 0x2ca83,
+	BNXT_ULP_CLASS_HID_2d71b = 0x2d71b,
+	BNXT_ULP_CLASS_HID_2d0df = 0x2d0df,
+	BNXT_ULP_CLASS_HID_280ab = 0x280ab,
+	BNXT_ULP_CLASS_HID_6cb17 = 0x6cb17,
+	BNXT_ULP_CLASS_HID_6d7af = 0x6d7af,
+	BNXT_ULP_CLASS_HID_6d153 = 0x6d153,
+	BNXT_ULP_CLASS_HID_6813f = 0x6813f,
+	BNXT_ULP_CLASS_HID_6b5b3 = 0x6b5b3,
+	BNXT_ULP_CLASS_HID_6c1cb = 0x6c1cb,
+	BNXT_ULP_CLASS_HID_6bb8f = 0x6bb8f,
+	BNXT_ULP_CLASS_HID_6c807 = 0x6c807,
+	BNXT_ULP_CLASS_HID_691df = 0x691df,
+	BNXT_ULP_CLASS_HID_69e57 = 0x69e57,
+	BNXT_ULP_CLASS_HID_6981b = 0x6981b,
+	BNXT_ULP_CLASS_HID_6a493 = 0x6a493,
+	BNXT_ULP_CLASS_HID_6d927 = 0x6d927,
+	BNXT_ULP_CLASS_HID_688f3 = 0x688f3,
+	BNXT_ULP_CLASS_HID_682b7 = 0x682b7,
+	BNXT_ULP_CLASS_HID_68ecf = 0x68ecf,
+	BNXT_ULP_CLASS_HID_6b7c7 = 0x6b7c7,
+	BNXT_ULP_CLASS_HID_6c45f = 0x6c45f,
+	BNXT_ULP_CLASS_HID_6be03 = 0x6be03,
+	BNXT_ULP_CLASS_HID_6ca9b = 0x6ca9b,
+	BNXT_ULP_CLASS_HID_6a263 = 0x6a263,
+	BNXT_ULP_CLASS_HID_6aefb = 0x6aefb,
+	BNXT_ULP_CLASS_HID_6a8bf = 0x6a8bf,
+	BNXT_ULP_CLASS_HID_6b537 = 0x6b537,
+	BNXT_ULP_CLASS_HID_6dbbb = 0x6dbbb,
+	BNXT_ULP_CLASS_HID_68b07 = 0x68b07,
+	BNXT_ULP_CLASS_HID_684cb = 0x684cb,
+	BNXT_ULP_CLASS_HID_69143 = 0x69143,
+	BNXT_ULP_CLASS_HID_6c5d7 = 0x6c5d7,
+	BNXT_ULP_CLASS_HID_6d26f = 0x6d26f,
+	BNXT_ULP_CLASS_HID_6cc13 = 0x6cc13,
+	BNXT_ULP_CLASS_HID_6d8ab = 0x6d8ab,
+	BNXT_ULP_CLASS_HID_38917 = 0x38917,
+	BNXT_ULP_CLASS_HID_395af = 0x395af,
+	BNXT_ULP_CLASS_HID_38f53 = 0x38f53,
+	BNXT_ULP_CLASS_HID_39beb = 0x39beb,
+	BNXT_ULP_CLASS_HID_3d07f = 0x3d07f,
+	BNXT_ULP_CLASS_HID_3dcf7 = 0x3dcf7,
+	BNXT_ULP_CLASS_HID_3d6bb = 0x3d6bb,
+	BNXT_ULP_CLASS_HID_38607 = 0x38607,
+	BNXT_ULP_CLASS_HID_3ac8b = 0x3ac8b,
+	BNXT_ULP_CLASS_HID_3b903 = 0x3b903,
+	BNXT_ULP_CLASS_HID_3b2c7 = 0x3b2c7,
+	BNXT_ULP_CLASS_HID_3bf5f = 0x3bf5f,
+	BNXT_ULP_CLASS_HID_39727 = 0x39727,
+	BNXT_ULP_CLASS_HID_3a3bf = 0x3a3bf,
+	BNXT_ULP_CLASS_HID_39d63 = 0x39d63,
+	BNXT_ULP_CLASS_HID_3a9fb = 0x3a9fb,
+	BNXT_ULP_CLASS_HID_3d2f3 = 0x3d2f3,
+	BNXT_ULP_CLASS_HID_3825f = 0x3825f,
+	BNXT_ULP_CLASS_HID_3d8cf = 0x3d8cf,
+	BNXT_ULP_CLASS_HID_3889b = 0x3889b,
+	BNXT_ULP_CLASS_HID_3bd2f = 0x3bd2f,
+	BNXT_ULP_CLASS_HID_3c9a7 = 0x3c9a7,
+	BNXT_ULP_CLASS_HID_3c36b = 0x3c36b,
+	BNXT_ULP_CLASS_HID_3cfe3 = 0x3cfe3,
+	BNXT_ULP_CLASS_HID_399bb = 0x399bb,
+	BNXT_ULP_CLASS_HID_3a633 = 0x3a633,
+	BNXT_ULP_CLASS_HID_39ff7 = 0x39ff7,
+	BNXT_ULP_CLASS_HID_3ac0f = 0x3ac0f,
+	BNXT_ULP_CLASS_HID_383d7 = 0x383d7,
+	BNXT_ULP_CLASS_HID_3906f = 0x3906f,
+	BNXT_ULP_CLASS_HID_38a13 = 0x38a13,
+	BNXT_ULP_CLASS_HID_396ab = 0x396ab,
+	BNXT_ULP_CLASS_HID_7846b = 0x7846b,
+	BNXT_ULP_CLASS_HID_790e3 = 0x790e3,
+	BNXT_ULP_CLASS_HID_78aa7 = 0x78aa7,
+	BNXT_ULP_CLASS_HID_7973f = 0x7973f,
+	BNXT_ULP_CLASS_HID_7cbb3 = 0x7cbb3,
+	BNXT_ULP_CLASS_HID_7d7cb = 0x7d7cb,
+	BNXT_ULP_CLASS_HID_7d18f = 0x7d18f,
+	BNXT_ULP_CLASS_HID_7815b = 0x7815b,
+	BNXT_ULP_CLASS_HID_7a7df = 0x7a7df,
+	BNXT_ULP_CLASS_HID_7b457 = 0x7b457,
+	BNXT_ULP_CLASS_HID_7ae1b = 0x7ae1b,
+	BNXT_ULP_CLASS_HID_7ba93 = 0x7ba93,
+	BNXT_ULP_CLASS_HID_7927b = 0x7927b,
+	BNXT_ULP_CLASS_HID_79ef3 = 0x79ef3,
+	BNXT_ULP_CLASS_HID_798b7 = 0x798b7,
+	BNXT_ULP_CLASS_HID_7a4cf = 0x7a4cf,
+	BNXT_ULP_CLASS_HID_7cdc7 = 0x7cdc7,
+	BNXT_ULP_CLASS_HID_7da5f = 0x7da5f,
+	BNXT_ULP_CLASS_HID_7d403 = 0x7d403,
+	BNXT_ULP_CLASS_HID_783ef = 0x783ef,
+	BNXT_ULP_CLASS_HID_7b863 = 0x7b863,
+	BNXT_ULP_CLASS_HID_7c4fb = 0x7c4fb,
+	BNXT_ULP_CLASS_HID_7bebf = 0x7bebf,
+	BNXT_ULP_CLASS_HID_7cb37 = 0x7cb37,
+	BNXT_ULP_CLASS_HID_7948f = 0x7948f,
+	BNXT_ULP_CLASS_HID_7a107 = 0x7a107,
+	BNXT_ULP_CLASS_HID_79acb = 0x79acb,
+	BNXT_ULP_CLASS_HID_7a743 = 0x7a743,
+	BNXT_ULP_CLASS_HID_7dbd7 = 0x7dbd7,
+	BNXT_ULP_CLASS_HID_78ba3 = 0x78ba3,
+	BNXT_ULP_CLASS_HID_78567 = 0x78567,
+	BNXT_ULP_CLASS_HID_791ff = 0x791ff,
+	BNXT_ULP_CLASS_HID_a3db = 0xa3db,
+	BNXT_ULP_CLASS_HID_b043 = 0xb043,
+	BNXT_ULP_CLASS_HID_aa07 = 0xaa07,
 	BNXT_ULP_CLASS_HID_b68f = 0xb68f,
-	BNXT_ULP_CLASS_HID_b94f = 0xb94f,
-	BNXT_ULP_CLASS_HID_fc0f = 0xfc0f,
-	BNXT_ULP_CLASS_HID_fecf = 0xfecf,
-	BNXT_ULP_CLASS_HID_b1f3 = 0xb1f3,
-	BNXT_ULP_CLASS_HID_b4b3 = 0xb4b3,
-	BNXT_ULP_CLASS_HID_f773 = 0xf773,
-	BNXT_ULP_CLASS_HID_fa33 = 0xfa33,
-	BNXT_ULP_CLASS_HID_1c7f3 = 0x1c7f3,
-	BNXT_ULP_CLASS_HID_1eab3 = 0x1eab3,
-	BNXT_ULP_CLASS_HID_1cd73 = 0x1cd73,
-	BNXT_ULP_CLASS_HID_1f033 = 0x1f033,
-	BNXT_ULP_CLASS_HID_1cc8f = 0x1cc8f,
-	BNXT_ULP_CLASS_HID_1ef4f = 0x1ef4f,
-	BNXT_ULP_CLASS_HID_1d20f = 0x1d20f,
-	BNXT_ULP_CLASS_HID_1f4cf = 0x1f4cf,
-	BNXT_ULP_CLASS_HID_da13 = 0xda13,
-	BNXT_ULP_CLASS_HID_a007 = 0xa007,
-	BNXT_ULP_CLASS_HID_c2c7 = 0xc2c7,
-	BNXT_ULP_CLASS_HID_e587 = 0xe587,
-	BNXT_ULP_CLASS_HID_d547 = 0xd547,
-	BNXT_ULP_CLASS_HID_f807 = 0xf807,
-	BNXT_ULP_CLASS_HID_dac7 = 0xdac7,
-	BNXT_ULP_CLASS_HID_e0cb = 0xe0cb,
-	BNXT_ULP_CLASS_HID_18e8b = 0x18e8b,
-	BNXT_ULP_CLASS_HID_1b14b = 0x1b14b,
-	BNXT_ULP_CLASS_HID_1d40b = 0x1d40b,
-	BNXT_ULP_CLASS_HID_1f6cb = 0x1f6cb,
-	BNXT_ULP_CLASS_HID_19347 = 0x19347,
-	BNXT_ULP_CLASS_HID_1b607 = 0x1b607,
-	BNXT_ULP_CLASS_HID_1d8c7 = 0x1d8c7,
-	BNXT_ULP_CLASS_HID_1fb87 = 0x1fb87,
+	BNXT_ULP_CLASS_HID_8e67 = 0x8e67,
+	BNXT_ULP_CLASS_HID_9aef = 0x9aef,
+	BNXT_ULP_CLASS_HID_94a3 = 0x94a3,
 	BNXT_ULP_CLASS_HID_a12b = 0xa12b,
-	BNXT_ULP_CLASS_HID_a3eb = 0xa3eb,
-	BNXT_ULP_CLASS_HID_e6ab = 0xe6ab,
-	BNXT_ULP_CLASS_HID_e96b = 0xe96b,
-	BNXT_ULP_CLASS_HID_9c1f = 0x9c1f,
-	BNXT_ULP_CLASS_HID_bedf = 0xbedf,
-	BNXT_ULP_CLASS_HID_e19f = 0xe19f,
-	BNXT_ULP_CLASS_HID_e45f = 0xe45f,
-	BNXT_ULP_CLASS_HID_1b21f = 0x1b21f,
-	BNXT_ULP_CLASS_HID_1b4df = 0x1b4df,
-	BNXT_ULP_CLASS_HID_1f79f = 0x1f79f,
-	BNXT_ULP_CLASS_HID_1fa5f = 0x1fa5f,
-	BNXT_ULP_CLASS_HID_1b72b = 0x1b72b,
-	BNXT_ULP_CLASS_HID_1b9eb = 0x1b9eb,
-	BNXT_ULP_CLASS_HID_1fcab = 0x1fcab,
-	BNXT_ULP_CLASS_HID_1ff6b = 0x1ff6b,
+	BNXT_ULP_CLASS_HID_c7af = 0xc7af,
+	BNXT_ULP_CLASS_HID_d3d7 = 0xd3d7,
+	BNXT_ULP_CLASS_HID_cdeb = 0xcdeb,
+	BNXT_ULP_CLASS_HID_da13 = 0xda13,
+	BNXT_ULP_CLASS_HID_b1cb = 0xb1cb,
+	BNXT_ULP_CLASS_HID_be73 = 0xbe73,
+	BNXT_ULP_CLASS_HID_b837 = 0xb837,
 	BNXT_ULP_CLASS_HID_c4bf = 0xc4bf,
-	BNXT_ULP_CLASS_HID_e77f = 0xe77f,
-	BNXT_ULP_CLASS_HID_ca3f = 0xca3f,
-	BNXT_ULP_CLASS_HID_ecff = 0xecff,
-	BNXT_ULP_CLASS_HID_bfe3 = 0xbfe3,
-	BNXT_ULP_CLASS_HID_e2a3 = 0xe2a3,
-	BNXT_ULP_CLASS_HID_c563 = 0xc563,
-	BNXT_ULP_CLASS_HID_e823 = 0xe823,
-	BNXT_ULP_CLASS_HID_1d5e3 = 0x1d5e3,
-	BNXT_ULP_CLASS_HID_1f8a3 = 0x1f8a3,
-	BNXT_ULP_CLASS_HID_1db63 = 0x1db63,
-	BNXT_ULP_CLASS_HID_1e117 = 0x1e117,
-	BNXT_ULP_CLASS_HID_1dabf = 0x1dabf,
-	BNXT_ULP_CLASS_HID_1a0a3 = 0x1a0a3,
-	BNXT_ULP_CLASS_HID_1c363 = 0x1c363,
-	BNXT_ULP_CLASS_HID_1e623 = 0x1e623,
-	BNXT_ULP_CLASS_HID_b043 = 0xb043,
-	BNXT_ULP_CLASS_HID_b303 = 0xb303,
-	BNXT_ULP_CLASS_HID_f5c3 = 0xf5c3,
-	BNXT_ULP_CLASS_HID_f883 = 0xf883,
-	BNXT_ULP_CLASS_HID_abb7 = 0xabb7,
-	BNXT_ULP_CLASS_HID_ae77 = 0xae77,
-	BNXT_ULP_CLASS_HID_f137 = 0xf137,
-	BNXT_ULP_CLASS_HID_f3f7 = 0xf3f7,
-	BNXT_ULP_CLASS_HID_1c1b7 = 0x1c1b7,
-	BNXT_ULP_CLASS_HID_1e477 = 0x1e477,
-	BNXT_ULP_CLASS_HID_1c737 = 0x1c737,
-	BNXT_ULP_CLASS_HID_1e9f7 = 0x1e9f7,
+	BNXT_ULP_CLASS_HID_49f0f = 0x49f0f,
+	BNXT_ULP_CLASS_HID_4abb7 = 0x4abb7,
+	BNXT_ULP_CLASS_HID_4a54b = 0x4a54b,
+	BNXT_ULP_CLASS_HID_4b1f3 = 0x4b1f3,
+	BNXT_ULP_CLASS_HID_489ab = 0x489ab,
+	BNXT_ULP_CLASS_HID_495d3 = 0x495d3,
+	BNXT_ULP_CLASS_HID_48f97 = 0x48f97,
+	BNXT_ULP_CLASS_HID_49c1f = 0x49c1f,
+	BNXT_ULP_CLASS_HID_4c293 = 0x4c293,
+	BNXT_ULP_CLASS_HID_4cf1b = 0x4cf1b,
+	BNXT_ULP_CLASS_HID_4c8df = 0x4c8df,
+	BNXT_ULP_CLASS_HID_4d547 = 0x4d547,
+	BNXT_ULP_CLASS_HID_4ad3f = 0x4ad3f,
+	BNXT_ULP_CLASS_HID_4b9a7 = 0x4b9a7,
+	BNXT_ULP_CLASS_HID_4b37b = 0x4b37b,
+	BNXT_ULP_CLASS_HID_4bfe3 = 0x4bfe3,
+	BNXT_ULP_CLASS_HID_1b9db = 0x1b9db,
 	BNXT_ULP_CLASS_HID_1c643 = 0x1c643,
-	BNXT_ULP_CLASS_HID_1e903 = 0x1e903,
-	BNXT_ULP_CLASS_HID_1cbc3 = 0x1cbc3,
-	BNXT_ULP_CLASS_HID_1ee83 = 0x1ee83,
-	BNXT_ULP_CLASS_HID_d3d7 = 0xd3d7,
-	BNXT_ULP_CLASS_HID_f697 = 0xf697,
-	BNXT_ULP_CLASS_HID_d957 = 0xd957,
-	BNXT_ULP_CLASS_HID_fc17 = 0xfc17,
-	BNXT_ULP_CLASS_HID_cf1b = 0xcf1b,
-	BNXT_ULP_CLASS_HID_f1db = 0xf1db,
-	BNXT_ULP_CLASS_HID_d49b = 0xd49b,
-	BNXT_ULP_CLASS_HID_f75b = 0xf75b,
-	BNXT_ULP_CLASS_HID_1884f = 0x1884f,
-	BNXT_ULP_CLASS_HID_1ab0f = 0x1ab0f,
-	BNXT_ULP_CLASS_HID_1cdcf = 0x1cdcf,
-	BNXT_ULP_CLASS_HID_1f08f = 0x1f08f,
-	BNXT_ULP_CLASS_HID_18d1b = 0x18d1b,
-	BNXT_ULP_CLASS_HID_1afdb = 0x1afdb,
-	BNXT_ULP_CLASS_HID_1d29b = 0x1d29b,
-	BNXT_ULP_CLASS_HID_1f55b = 0x1f55b,
-	BNXT_ULP_CLASS_HID_9aef = 0x9aef,
-	BNXT_ULP_CLASS_HID_bdaf = 0xbdaf,
-	BNXT_ULP_CLASS_HID_e06f = 0xe06f,
-	BNXT_ULP_CLASS_HID_e32f = 0xe32f,
-	BNXT_ULP_CLASS_HID_95d3 = 0x95d3,
-	BNXT_ULP_CLASS_HID_b893 = 0xb893,
-	BNXT_ULP_CLASS_HID_db53 = 0xdb53,
-	BNXT_ULP_CLASS_HID_fe13 = 0xfe13,
-	BNXT_ULP_CLASS_HID_1abd3 = 0x1abd3,
-	BNXT_ULP_CLASS_HID_1ae93 = 0x1ae93,
-	BNXT_ULP_CLASS_HID_1f153 = 0x1f153,
-	BNXT_ULP_CLASS_HID_1f413 = 0x1f413,
+	BNXT_ULP_CLASS_HID_1c007 = 0x1c007,
+	BNXT_ULP_CLASS_HID_1cc8f = 0x1cc8f,
+	BNXT_ULP_CLASS_HID_1a467 = 0x1a467,
 	BNXT_ULP_CLASS_HID_1b0ef = 0x1b0ef,
-	BNXT_ULP_CLASS_HID_1b3af = 0x1b3af,
-	BNXT_ULP_CLASS_HID_1f66f = 0x1f66f,
-	BNXT_ULP_CLASS_HID_1f92f = 0x1f92f,
-	BNXT_ULP_CLASS_HID_be73 = 0xbe73,
-	BNXT_ULP_CLASS_HID_e133 = 0xe133,
-	BNXT_ULP_CLASS_HID_c3f3 = 0xc3f3,
-	BNXT_ULP_CLASS_HID_e6b3 = 0xe6b3,
-	BNXT_ULP_CLASS_HID_b9a7 = 0xb9a7,
-	BNXT_ULP_CLASS_HID_bc67 = 0xbc67,
-	BNXT_ULP_CLASS_HID_ff27 = 0xff27,
-	BNXT_ULP_CLASS_HID_e1e7 = 0xe1e7,
-	BNXT_ULP_CLASS_HID_1cfa7 = 0x1cfa7,
-	BNXT_ULP_CLASS_HID_1f267 = 0x1f267,
-	BNXT_ULP_CLASS_HID_1d527 = 0x1d527,
-	BNXT_ULP_CLASS_HID_1f7e7 = 0x1f7e7,
+	BNXT_ULP_CLASS_HID_1aaa3 = 0x1aaa3,
+	BNXT_ULP_CLASS_HID_1b72b = 0x1b72b,
+	BNXT_ULP_CLASS_HID_18093 = 0x18093,
+	BNXT_ULP_CLASS_HID_18d1b = 0x18d1b,
+	BNXT_ULP_CLASS_HID_186df = 0x186df,
+	BNXT_ULP_CLASS_HID_19347 = 0x19347,
+	BNXT_ULP_CLASS_HID_1c7cb = 0x1c7cb,
 	BNXT_ULP_CLASS_HID_1d473 = 0x1d473,
-	BNXT_ULP_CLASS_HID_1f733 = 0x1f733,
-	BNXT_ULP_CLASS_HID_1d9f3 = 0x1d9f3,
-	BNXT_ULP_CLASS_HID_1fcb3 = 0x1fcb3,
-	BNXT_ULP_CLASS_HID_aa07 = 0xaa07,
-	BNXT_ULP_CLASS_HID_acc7 = 0xacc7,
+	BNXT_ULP_CLASS_HID_1ce37 = 0x1ce37,
+	BNXT_ULP_CLASS_HID_1dabf = 0x1dabf,
+	BNXT_ULP_CLASS_HID_5b50f = 0x5b50f,
+	BNXT_ULP_CLASS_HID_5c1b7 = 0x5c1b7,
+	BNXT_ULP_CLASS_HID_5bb4b = 0x5bb4b,
+	BNXT_ULP_CLASS_HID_5c7f3 = 0x5c7f3,
+	BNXT_ULP_CLASS_HID_59fab = 0x59fab,
+	BNXT_ULP_CLASS_HID_5abd3 = 0x5abd3,
+	BNXT_ULP_CLASS_HID_5a597 = 0x5a597,
+	BNXT_ULP_CLASS_HID_5b21f = 0x5b21f,
+	BNXT_ULP_CLASS_HID_5d893 = 0x5d893,
+	BNXT_ULP_CLASS_HID_5884f = 0x5884f,
+	BNXT_ULP_CLASS_HID_58203 = 0x58203,
+	BNXT_ULP_CLASS_HID_58e8b = 0x58e8b,
+	BNXT_ULP_CLASS_HID_5c33f = 0x5c33f,
+	BNXT_ULP_CLASS_HID_5cfa7 = 0x5cfa7,
+	BNXT_ULP_CLASS_HID_5c97b = 0x5c97b,
+	BNXT_ULP_CLASS_HID_5d5e3 = 0x5d5e3,
+	BNXT_ULP_CLASS_HID_e95b = 0xe95b,
+	BNXT_ULP_CLASS_HID_f5c3 = 0xf5c3,
 	BNXT_ULP_CLASS_HID_ef87 = 0xef87,
-	BNXT_ULP_CLASS_HID_f247 = 0xf247,
-	BNXT_ULP_CLASS_HID_a54b = 0xa54b,
-	BNXT_ULP_CLASS_HID_a80b = 0xa80b,
-	BNXT_ULP_CLASS_HID_eacb = 0xeacb,
-	BNXT_ULP_CLASS_HID_ed8b = 0xed8b,
-	BNXT_ULP_CLASS_HID_1bb4b = 0x1bb4b,
-	BNXT_ULP_CLASS_HID_1be0b = 0x1be0b,
-	BNXT_ULP_CLASS_HID_1c0cb = 0x1c0cb,
-	BNXT_ULP_CLASS_HID_1e38b = 0x1e38b,
-	BNXT_ULP_CLASS_HID_1c007 = 0x1c007,
-	BNXT_ULP_CLASS_HID_1e2c7 = 0x1e2c7,
-	BNXT_ULP_CLASS_HID_1c587 = 0x1c587,
-	BNXT_ULP_CLASS_HID_1e847 = 0x1e847,
-	BNXT_ULP_CLASS_HID_cdeb = 0xcdeb,
-	BNXT_ULP_CLASS_HID_f0ab = 0xf0ab,
-	BNXT_ULP_CLASS_HID_d36b = 0xd36b,
-	BNXT_ULP_CLASS_HID_f62b = 0xf62b,
-	BNXT_ULP_CLASS_HID_c8df = 0xc8df,
-	BNXT_ULP_CLASS_HID_eb9f = 0xeb9f,
-	BNXT_ULP_CLASS_HID_ce5f = 0xce5f,
-	BNXT_ULP_CLASS_HID_f11f = 0xf11f,
-	BNXT_ULP_CLASS_HID_18203 = 0x18203,
-	BNXT_ULP_CLASS_HID_1a4c3 = 0x1a4c3,
-	BNXT_ULP_CLASS_HID_1c783 = 0x1c783,
-	BNXT_ULP_CLASS_HID_1ea43 = 0x1ea43,
-	BNXT_ULP_CLASS_HID_186df = 0x186df,
-	BNXT_ULP_CLASS_HID_1a99f = 0x1a99f,
-	BNXT_ULP_CLASS_HID_1cc5f = 0x1cc5f,
-	BNXT_ULP_CLASS_HID_1ef1f = 0x1ef1f,
-	BNXT_ULP_CLASS_HID_94a3 = 0x94a3,
-	BNXT_ULP_CLASS_HID_b763 = 0xb763,
+	BNXT_ULP_CLASS_HID_fc0f = 0xfc0f,
+	BNXT_ULP_CLASS_HID_d3e7 = 0xd3e7,
+	BNXT_ULP_CLASS_HID_e06f = 0xe06f,
 	BNXT_ULP_CLASS_HID_da23 = 0xda23,
-	BNXT_ULP_CLASS_HID_fce3 = 0xfce3,
-	BNXT_ULP_CLASS_HID_8f97 = 0x8f97,
-	BNXT_ULP_CLASS_HID_b257 = 0xb257,
-	BNXT_ULP_CLASS_HID_d517 = 0xd517,
-	BNXT_ULP_CLASS_HID_f7d7 = 0xf7d7,
-	BNXT_ULP_CLASS_HID_1a597 = 0x1a597,
-	BNXT_ULP_CLASS_HID_1a857 = 0x1a857,
-	BNXT_ULP_CLASS_HID_1eb17 = 0x1eb17,
-	BNXT_ULP_CLASS_HID_1edd7 = 0x1edd7,
-	BNXT_ULP_CLASS_HID_1aaa3 = 0x1aaa3,
-	BNXT_ULP_CLASS_HID_1ad63 = 0x1ad63,
-	BNXT_ULP_CLASS_HID_1f023 = 0x1f023,
-	BNXT_ULP_CLASS_HID_1f2e3 = 0x1f2e3,
-	BNXT_ULP_CLASS_HID_b837 = 0xb837,
-	BNXT_ULP_CLASS_HID_baf7 = 0xbaf7,
+	BNXT_ULP_CLASS_HID_e6ab = 0xe6ab,
+	BNXT_ULP_CLASS_HID_cd2f = 0xcd2f,
+	BNXT_ULP_CLASS_HID_d957 = 0xd957,
+	BNXT_ULP_CLASS_HID_d36b = 0xd36b,
+	BNXT_ULP_CLASS_HID_c2c7 = 0xc2c7,
+	BNXT_ULP_CLASS_HID_f74b = 0xf74b,
+	BNXT_ULP_CLASS_HID_c3f3 = 0xc3f3,
 	BNXT_ULP_CLASS_HID_fdb7 = 0xfdb7,
-	BNXT_ULP_CLASS_HID_e077 = 0xe077,
-	BNXT_ULP_CLASS_HID_b37b = 0xb37b,
-	BNXT_ULP_CLASS_HID_b63b = 0xb63b,
-	BNXT_ULP_CLASS_HID_f8fb = 0xf8fb,
-	BNXT_ULP_CLASS_HID_fbbb = 0xfbbb,
-	BNXT_ULP_CLASS_HID_1c97b = 0x1c97b,
-	BNXT_ULP_CLASS_HID_1ec3b = 0x1ec3b,
-	BNXT_ULP_CLASS_HID_1cefb = 0x1cefb,
-	BNXT_ULP_CLASS_HID_1f1bb = 0x1f1bb,
-	BNXT_ULP_CLASS_HID_1ce37 = 0x1ce37,
-	BNXT_ULP_CLASS_HID_1f0f7 = 0x1f0f7,
+	BNXT_ULP_CLASS_HID_ca3f = 0xca3f,
+	BNXT_ULP_CLASS_HID_4e48f = 0x4e48f,
+	BNXT_ULP_CLASS_HID_4f137 = 0x4f137,
+	BNXT_ULP_CLASS_HID_4eacb = 0x4eacb,
+	BNXT_ULP_CLASS_HID_4f773 = 0x4f773,
+	BNXT_ULP_CLASS_HID_4cf2b = 0x4cf2b,
+	BNXT_ULP_CLASS_HID_4db53 = 0x4db53,
+	BNXT_ULP_CLASS_HID_4d517 = 0x4d517,
+	BNXT_ULP_CLASS_HID_4e19f = 0x4e19f,
+	BNXT_ULP_CLASS_HID_4c813 = 0x4c813,
+	BNXT_ULP_CLASS_HID_4d49b = 0x4d49b,
+	BNXT_ULP_CLASS_HID_4ce5f = 0x4ce5f,
+	BNXT_ULP_CLASS_HID_4dac7 = 0x4dac7,
+	BNXT_ULP_CLASS_HID_4f2bf = 0x4f2bf,
+	BNXT_ULP_CLASS_HID_4ff27 = 0x4ff27,
+	BNXT_ULP_CLASS_HID_4f8fb = 0x4f8fb,
+	BNXT_ULP_CLASS_HID_4c563 = 0x4c563,
+	BNXT_ULP_CLASS_HID_1ff5b = 0x1ff5b,
+	BNXT_ULP_CLASS_HID_1cbc3 = 0x1cbc3,
+	BNXT_ULP_CLASS_HID_1c587 = 0x1c587,
+	BNXT_ULP_CLASS_HID_1d20f = 0x1d20f,
+	BNXT_ULP_CLASS_HID_1e9e7 = 0x1e9e7,
+	BNXT_ULP_CLASS_HID_1f66f = 0x1f66f,
+	BNXT_ULP_CLASS_HID_1f023 = 0x1f023,
+	BNXT_ULP_CLASS_HID_1fcab = 0x1fcab,
+	BNXT_ULP_CLASS_HID_1c613 = 0x1c613,
+	BNXT_ULP_CLASS_HID_1d29b = 0x1d29b,
+	BNXT_ULP_CLASS_HID_1cc5f = 0x1cc5f,
+	BNXT_ULP_CLASS_HID_1d8c7 = 0x1d8c7,
+	BNXT_ULP_CLASS_HID_1cd4b = 0x1cd4b,
+	BNXT_ULP_CLASS_HID_1d9f3 = 0x1d9f3,
 	BNXT_ULP_CLASS_HID_1d3b7 = 0x1d3b7,
-	BNXT_ULP_CLASS_HID_1f677 = 0x1f677,
-	BNXT_ULP_CLASS_HID_a3db = 0xa3db,
+	BNXT_ULP_CLASS_HID_1c363 = 0x1c363,
+	BNXT_ULP_CLASS_HID_5fa8f = 0x5fa8f,
+	BNXT_ULP_CLASS_HID_5c737 = 0x5c737,
+	BNXT_ULP_CLASS_HID_5c0cb = 0x5c0cb,
+	BNXT_ULP_CLASS_HID_5cd73 = 0x5cd73,
+	BNXT_ULP_CLASS_HID_5e52b = 0x5e52b,
+	BNXT_ULP_CLASS_HID_5f153 = 0x5f153,
+	BNXT_ULP_CLASS_HID_5eb17 = 0x5eb17,
+	BNXT_ULP_CLASS_HID_5f79f = 0x5f79f,
+	BNXT_ULP_CLASS_HID_5c147 = 0x5c147,
+	BNXT_ULP_CLASS_HID_5cdcf = 0x5cdcf,
+	BNXT_ULP_CLASS_HID_5c783 = 0x5c783,
+	BNXT_ULP_CLASS_HID_5d40b = 0x5d40b,
+	BNXT_ULP_CLASS_HID_5c8bf = 0x5c8bf,
+	BNXT_ULP_CLASS_HID_5d527 = 0x5d527,
+	BNXT_ULP_CLASS_HID_5cefb = 0x5cefb,
+	BNXT_ULP_CLASS_HID_5db63 = 0x5db63,
 	BNXT_ULP_CLASS_HID_a69b = 0xa69b,
-	BNXT_ULP_CLASS_HID_e95b = 0xe95b,
-	BNXT_ULP_CLASS_HID_ec1b = 0xec1b,
-	BNXT_ULP_CLASS_HID_9f0f = 0x9f0f,
-	BNXT_ULP_CLASS_HID_a1cf = 0xa1cf,
-	BNXT_ULP_CLASS_HID_e48f = 0xe48f,
-	BNXT_ULP_CLASS_HID_e74f = 0xe74f,
-	BNXT_ULP_CLASS_HID_1b50f = 0x1b50f,
-	BNXT_ULP_CLASS_HID_1b7cf = 0x1b7cf,
-	BNXT_ULP_CLASS_HID_1fa8f = 0x1fa8f,
-	BNXT_ULP_CLASS_HID_1fd4f = 0x1fd4f,
-	BNXT_ULP_CLASS_HID_1b9db = 0x1b9db,
-	BNXT_ULP_CLASS_HID_1bc9b = 0x1bc9b,
-	BNXT_ULP_CLASS_HID_1ff5b = 0x1ff5b,
-	BNXT_ULP_CLASS_HID_1e21b = 0x1e21b,
-	BNXT_ULP_CLASS_HID_c7af = 0xc7af,
+	BNXT_ULP_CLASS_HID_b303 = 0xb303,
+	BNXT_ULP_CLASS_HID_acc7 = 0xacc7,
+	BNXT_ULP_CLASS_HID_b94f = 0xb94f,
+	BNXT_ULP_CLASS_HID_b127 = 0xb127,
+	BNXT_ULP_CLASS_HID_bdaf = 0xbdaf,
+	BNXT_ULP_CLASS_HID_b763 = 0xb763,
+	BNXT_ULP_CLASS_HID_a3eb = 0xa3eb,
 	BNXT_ULP_CLASS_HID_ea6f = 0xea6f,
-	BNXT_ULP_CLASS_HID_cd2f = 0xcd2f,
-	BNXT_ULP_CLASS_HID_efef = 0xefef,
-	BNXT_ULP_CLASS_HID_c293 = 0xc293,
-	BNXT_ULP_CLASS_HID_e553 = 0xe553,
-	BNXT_ULP_CLASS_HID_c813 = 0xc813,
-	BNXT_ULP_CLASS_HID_ead3 = 0xead3,
-	BNXT_ULP_CLASS_HID_1d893 = 0x1d893,
-	BNXT_ULP_CLASS_HID_1fb53 = 0x1fb53,
-	BNXT_ULP_CLASS_HID_1c147 = 0x1c147,
-	BNXT_ULP_CLASS_HID_1e407 = 0x1e407,
-	BNXT_ULP_CLASS_HID_18093 = 0x18093,
+	BNXT_ULP_CLASS_HID_f697 = 0xf697,
+	BNXT_ULP_CLASS_HID_f0ab = 0xf0ab,
+	BNXT_ULP_CLASS_HID_a007 = 0xa007,
+	BNXT_ULP_CLASS_HID_b48b = 0xb48b,
+	BNXT_ULP_CLASS_HID_e133 = 0xe133,
+	BNXT_ULP_CLASS_HID_baf7 = 0xbaf7,
+	BNXT_ULP_CLASS_HID_e77f = 0xe77f,
+	BNXT_ULP_CLASS_HID_4a1cf = 0x4a1cf,
+	BNXT_ULP_CLASS_HID_4ae77 = 0x4ae77,
+	BNXT_ULP_CLASS_HID_4a80b = 0x4a80b,
+	BNXT_ULP_CLASS_HID_4b4b3 = 0x4b4b3,
+	BNXT_ULP_CLASS_HID_4ac6b = 0x4ac6b,
+	BNXT_ULP_CLASS_HID_4b893 = 0x4b893,
+	BNXT_ULP_CLASS_HID_4b257 = 0x4b257,
+	BNXT_ULP_CLASS_HID_4bedf = 0x4bedf,
+	BNXT_ULP_CLASS_HID_4e553 = 0x4e553,
+	BNXT_ULP_CLASS_HID_4f1db = 0x4f1db,
+	BNXT_ULP_CLASS_HID_4eb9f = 0x4eb9f,
+	BNXT_ULP_CLASS_HID_4f807 = 0x4f807,
+	BNXT_ULP_CLASS_HID_4afff = 0x4afff,
+	BNXT_ULP_CLASS_HID_4bc67 = 0x4bc67,
+	BNXT_ULP_CLASS_HID_4b63b = 0x4b63b,
+	BNXT_ULP_CLASS_HID_4e2a3 = 0x4e2a3,
+	BNXT_ULP_CLASS_HID_1bc9b = 0x1bc9b,
+	BNXT_ULP_CLASS_HID_1e903 = 0x1e903,
+	BNXT_ULP_CLASS_HID_1e2c7 = 0x1e2c7,
+	BNXT_ULP_CLASS_HID_1ef4f = 0x1ef4f,
+	BNXT_ULP_CLASS_HID_1a727 = 0x1a727,
+	BNXT_ULP_CLASS_HID_1b3af = 0x1b3af,
+	BNXT_ULP_CLASS_HID_1ad63 = 0x1ad63,
+	BNXT_ULP_CLASS_HID_1b9eb = 0x1b9eb,
 	BNXT_ULP_CLASS_HID_1a353 = 0x1a353,
-	BNXT_ULP_CLASS_HID_1c613 = 0x1c613,
-	BNXT_ULP_CLASS_HID_1e8d3 = 0x1e8d3,
-	BNXT_ULP_CLASS_HID_8e67 = 0x8e67,
-	BNXT_ULP_CLASS_HID_b127 = 0xb127,
-	BNXT_ULP_CLASS_HID_d3e7 = 0xd3e7,
+	BNXT_ULP_CLASS_HID_1afdb = 0x1afdb,
+	BNXT_ULP_CLASS_HID_1a99f = 0x1a99f,
+	BNXT_ULP_CLASS_HID_1b607 = 0x1b607,
+	BNXT_ULP_CLASS_HID_1ea8b = 0x1ea8b,
+	BNXT_ULP_CLASS_HID_1f733 = 0x1f733,
+	BNXT_ULP_CLASS_HID_1f0f7 = 0x1f0f7,
+	BNXT_ULP_CLASS_HID_1a0a3 = 0x1a0a3,
+	BNXT_ULP_CLASS_HID_5b7cf = 0x5b7cf,
+	BNXT_ULP_CLASS_HID_5e477 = 0x5e477,
+	BNXT_ULP_CLASS_HID_5be0b = 0x5be0b,
+	BNXT_ULP_CLASS_HID_5eab3 = 0x5eab3,
+	BNXT_ULP_CLASS_HID_5a26b = 0x5a26b,
+	BNXT_ULP_CLASS_HID_5ae93 = 0x5ae93,
+	BNXT_ULP_CLASS_HID_5a857 = 0x5a857,
+	BNXT_ULP_CLASS_HID_5b4df = 0x5b4df,
+	BNXT_ULP_CLASS_HID_5fb53 = 0x5fb53,
+	BNXT_ULP_CLASS_HID_5ab0f = 0x5ab0f,
+	BNXT_ULP_CLASS_HID_5a4c3 = 0x5a4c3,
+	BNXT_ULP_CLASS_HID_5b14b = 0x5b14b,
+	BNXT_ULP_CLASS_HID_5e5ff = 0x5e5ff,
+	BNXT_ULP_CLASS_HID_5f267 = 0x5f267,
+	BNXT_ULP_CLASS_HID_5ec3b = 0x5ec3b,
+	BNXT_ULP_CLASS_HID_5f8a3 = 0x5f8a3,
+	BNXT_ULP_CLASS_HID_ec1b = 0xec1b,
+	BNXT_ULP_CLASS_HID_f883 = 0xf883,
+	BNXT_ULP_CLASS_HID_f247 = 0xf247,
+	BNXT_ULP_CLASS_HID_fecf = 0xfecf,
 	BNXT_ULP_CLASS_HID_f6a7 = 0xf6a7,
-	BNXT_ULP_CLASS_HID_89ab = 0x89ab,
-	BNXT_ULP_CLASS_HID_ac6b = 0xac6b,
-	BNXT_ULP_CLASS_HID_cf2b = 0xcf2b,
-	BNXT_ULP_CLASS_HID_f1eb = 0xf1eb,
-	BNXT_ULP_CLASS_HID_19fab = 0x19fab,
-	BNXT_ULP_CLASS_HID_1a26b = 0x1a26b,
-	BNXT_ULP_CLASS_HID_1e52b = 0x1e52b,
-	BNXT_ULP_CLASS_HID_1e7eb = 0x1e7eb,
-	BNXT_ULP_CLASS_HID_1a467 = 0x1a467,
-	BNXT_ULP_CLASS_HID_1a727 = 0x1a727,
-	BNXT_ULP_CLASS_HID_1e9e7 = 0x1e9e7,
-	BNXT_ULP_CLASS_HID_1eca7 = 0x1eca7,
-	BNXT_ULP_CLASS_HID_b1cb = 0xb1cb,
-	BNXT_ULP_CLASS_HID_b48b = 0xb48b,
-	BNXT_ULP_CLASS_HID_f74b = 0xf74b,
+	BNXT_ULP_CLASS_HID_e32f = 0xe32f,
+	BNXT_ULP_CLASS_HID_fce3 = 0xfce3,
+	BNXT_ULP_CLASS_HID_e96b = 0xe96b,
+	BNXT_ULP_CLASS_HID_efef = 0xefef,
+	BNXT_ULP_CLASS_HID_fc17 = 0xfc17,
+	BNXT_ULP_CLASS_HID_f62b = 0xf62b,
+	BNXT_ULP_CLASS_HID_e587 = 0xe587,
 	BNXT_ULP_CLASS_HID_fa0b = 0xfa0b,
-	BNXT_ULP_CLASS_HID_ad3f = 0xad3f,
-	BNXT_ULP_CLASS_HID_afff = 0xafff,
-	BNXT_ULP_CLASS_HID_f2bf = 0xf2bf,
-	BNXT_ULP_CLASS_HID_f57f = 0xf57f,
-	BNXT_ULP_CLASS_HID_1c33f = 0x1c33f,
-	BNXT_ULP_CLASS_HID_1e5ff = 0x1e5ff,
-	BNXT_ULP_CLASS_HID_1c8bf = 0x1c8bf,
-	BNXT_ULP_CLASS_HID_1eb7f = 0x1eb7f,
-	BNXT_ULP_CLASS_HID_1c7cb = 0x1c7cb,
-	BNXT_ULP_CLASS_HID_1ea8b = 0x1ea8b,
-	BNXT_ULP_CLASS_HID_1cd4b = 0x1cd4b,
+	BNXT_ULP_CLASS_HID_e6b3 = 0xe6b3,
+	BNXT_ULP_CLASS_HID_e077 = 0xe077,
+	BNXT_ULP_CLASS_HID_ecff = 0xecff,
+	BNXT_ULP_CLASS_HID_4e74f = 0x4e74f,
+	BNXT_ULP_CLASS_HID_4f3f7 = 0x4f3f7,
+	BNXT_ULP_CLASS_HID_4ed8b = 0x4ed8b,
+	BNXT_ULP_CLASS_HID_4fa33 = 0x4fa33,
+	BNXT_ULP_CLASS_HID_4f1eb = 0x4f1eb,
+	BNXT_ULP_CLASS_HID_4fe13 = 0x4fe13,
+	BNXT_ULP_CLASS_HID_4f7d7 = 0x4f7d7,
+	BNXT_ULP_CLASS_HID_4e45f = 0x4e45f,
+	BNXT_ULP_CLASS_HID_4ead3 = 0x4ead3,
+	BNXT_ULP_CLASS_HID_4f75b = 0x4f75b,
+	BNXT_ULP_CLASS_HID_4f11f = 0x4f11f,
+	BNXT_ULP_CLASS_HID_4e0cb = 0x4e0cb,
+	BNXT_ULP_CLASS_HID_4f57f = 0x4f57f,
+	BNXT_ULP_CLASS_HID_4e1e7 = 0x4e1e7,
+	BNXT_ULP_CLASS_HID_4fbbb = 0x4fbbb,
+	BNXT_ULP_CLASS_HID_4e823 = 0x4e823,
+	BNXT_ULP_CLASS_HID_1e21b = 0x1e21b,
+	BNXT_ULP_CLASS_HID_1ee83 = 0x1ee83,
+	BNXT_ULP_CLASS_HID_1e847 = 0x1e847,
+	BNXT_ULP_CLASS_HID_1f4cf = 0x1f4cf,
+	BNXT_ULP_CLASS_HID_1eca7 = 0x1eca7,
+	BNXT_ULP_CLASS_HID_1f92f = 0x1f92f,
+	BNXT_ULP_CLASS_HID_1f2e3 = 0x1f2e3,
+	BNXT_ULP_CLASS_HID_1ff6b = 0x1ff6b,
+	BNXT_ULP_CLASS_HID_1e8d3 = 0x1e8d3,
+	BNXT_ULP_CLASS_HID_1f55b = 0x1f55b,
+	BNXT_ULP_CLASS_HID_1ef1f = 0x1ef1f,
+	BNXT_ULP_CLASS_HID_1fb87 = 0x1fb87,
 	BNXT_ULP_CLASS_HID_1f00b = 0x1f00b,
-	BNXT_ULP_CLASS_HID_9117 = 0x9117,
-	BNXT_ULP_CLASS_HID_b3d7 = 0xb3d7,
-	BNXT_ULP_CLASS_HID_d697 = 0xd697,
-	BNXT_ULP_CLASS_HID_f957 = 0xf957,
-	BNXT_ULP_CLASS_HID_8c5b = 0x8c5b,
-	BNXT_ULP_CLASS_HID_af1b = 0xaf1b,
-	BNXT_ULP_CLASS_HID_d1db = 0xd1db,
-	BNXT_ULP_CLASS_HID_f49b = 0xf49b,
-	BNXT_ULP_CLASS_HID_1a25b = 0x1a25b,
-	BNXT_ULP_CLASS_HID_1a51b = 0x1a51b,
-	BNXT_ULP_CLASS_HID_1e7db = 0x1e7db,
-	BNXT_ULP_CLASS_HID_1ea9b = 0x1ea9b,
-	BNXT_ULP_CLASS_HID_1a717 = 0x1a717,
-	BNXT_ULP_CLASS_HID_1a9d7 = 0x1a9d7,
-	BNXT_ULP_CLASS_HID_1ec97 = 0x1ec97,
-	BNXT_ULP_CLASS_HID_1ef57 = 0x1ef57,
-	BNXT_ULP_CLASS_HID_b4fb = 0xb4fb,
-	BNXT_ULP_CLASS_HID_b7bb = 0xb7bb,
-	BNXT_ULP_CLASS_HID_fa7b = 0xfa7b,
-	BNXT_ULP_CLASS_HID_fd3b = 0xfd3b,
-	BNXT_ULP_CLASS_HID_b02f = 0xb02f,
-	BNXT_ULP_CLASS_HID_b2ef = 0xb2ef,
-	BNXT_ULP_CLASS_HID_f5af = 0xf5af,
-	BNXT_ULP_CLASS_HID_f86f = 0xf86f,
-	BNXT_ULP_CLASS_HID_1c62f = 0x1c62f,
-	BNXT_ULP_CLASS_HID_1e8ef = 0x1e8ef,
-	BNXT_ULP_CLASS_HID_1cbaf = 0x1cbaf,
-	BNXT_ULP_CLASS_HID_1ee6f = 0x1ee6f,
-	BNXT_ULP_CLASS_HID_1cafb = 0x1cafb,
-	BNXT_ULP_CLASS_HID_1edbb = 0x1edbb,
-	BNXT_ULP_CLASS_HID_1d07b = 0x1d07b,
-	BNXT_ULP_CLASS_HID_1f33b = 0x1f33b,
-	BNXT_ULP_CLASS_HID_8b2b = 0x8b2b,
-	BNXT_ULP_CLASS_HID_adeb = 0xadeb,
-	BNXT_ULP_CLASS_HID_d0ab = 0xd0ab,
-	BNXT_ULP_CLASS_HID_f36b = 0xf36b,
-	BNXT_ULP_CLASS_HID_861f = 0x861f,
-	BNXT_ULP_CLASS_HID_a8df = 0xa8df,
-	BNXT_ULP_CLASS_HID_cb9f = 0xcb9f,
-	BNXT_ULP_CLASS_HID_ee5f = 0xee5f,
-	BNXT_ULP_CLASS_HID_19c1f = 0x19c1f,
-	BNXT_ULP_CLASS_HID_1bedf = 0x1bedf,
-	BNXT_ULP_CLASS_HID_1e19f = 0x1e19f,
-	BNXT_ULP_CLASS_HID_1e45f = 0x1e45f,
-	BNXT_ULP_CLASS_HID_1a12b = 0x1a12b,
-	BNXT_ULP_CLASS_HID_1a3eb = 0x1a3eb,
-	BNXT_ULP_CLASS_HID_1e6ab = 0x1e6ab,
-	BNXT_ULP_CLASS_HID_1e96b = 0x1e96b,
-	BNXT_ULP_CLASS_HID_aebf = 0xaebf,
-	BNXT_ULP_CLASS_HID_b17f = 0xb17f,
-	BNXT_ULP_CLASS_HID_f43f = 0xf43f,
-	BNXT_ULP_CLASS_HID_f6ff = 0xf6ff,
-	BNXT_ULP_CLASS_HID_a9e3 = 0xa9e3,
-	BNXT_ULP_CLASS_HID_aca3 = 0xaca3,
-	BNXT_ULP_CLASS_HID_ef63 = 0xef63,
-	BNXT_ULP_CLASS_HID_f223 = 0xf223,
-	BNXT_ULP_CLASS_HID_1bfe3 = 0x1bfe3,
-	BNXT_ULP_CLASS_HID_1e2a3 = 0x1e2a3,
-	BNXT_ULP_CLASS_HID_1c563 = 0x1c563,
-	BNXT_ULP_CLASS_HID_1e823 = 0x1e823,
-	BNXT_ULP_CLASS_HID_1c4bf = 0x1c4bf,
-	BNXT_ULP_CLASS_HID_1e77f = 0x1e77f,
-	BNXT_ULP_CLASS_HID_1ca3f = 0x1ca3f,
-	BNXT_ULP_CLASS_HID_1ecff = 0x1ecff,
-	BNXT_ULP_CLASS_HID_2543 = 0x2543,
-	BNXT_ULP_CLASS_HID_2b8f = 0x2b8f,
-	BNXT_ULP_CLASS_HID_26f3 = 0x26f3,
-	BNXT_ULP_CLASS_HID_4f13 = 0x4f13,
-	BNXT_ULP_CLASS_HID_4a47 = 0x4a47,
-	BNXT_ULP_CLASS_HID_162b = 0x162b,
-	BNXT_ULP_CLASS_HID_111f = 0x111f,
-	BNXT_ULP_CLASS_HID_39bf = 0x39bf,
-	BNXT_ULP_CLASS_HID_34e3 = 0x34e3,
-	BNXT_ULP_CLASS_HID_20b7 = 0x20b7,
-	BNXT_ULP_CLASS_HID_48d7 = 0x48d7,
-	BNXT_ULP_CLASS_HID_441b = 0x441b,
-	BNXT_ULP_CLASS_HID_0fef = 0x0fef,
-	BNXT_ULP_CLASS_HID_0ad3 = 0x0ad3,
-	BNXT_ULP_CLASS_HID_3373 = 0x3373,
-	BNXT_ULP_CLASS_HID_2ea7 = 0x2ea7,
-	BNXT_ULP_CLASS_HID_b6ef = 0xb6ef,
-	BNXT_ULP_CLASS_HID_b92f = 0xb92f,
-	BNXT_ULP_CLASS_HID_fc6f = 0xfc6f,
-	BNXT_ULP_CLASS_HID_feaf = 0xfeaf,
-	BNXT_ULP_CLASS_HID_b193 = 0xb193,
-	BNXT_ULP_CLASS_HID_b4d3 = 0xb4d3,
-	BNXT_ULP_CLASS_HID_f713 = 0xf713,
-	BNXT_ULP_CLASS_HID_fa53 = 0xfa53,
-	BNXT_ULP_CLASS_HID_1c793 = 0x1c793,
-	BNXT_ULP_CLASS_HID_1ead3 = 0x1ead3,
-	BNXT_ULP_CLASS_HID_1cd13 = 0x1cd13,
-	BNXT_ULP_CLASS_HID_1f053 = 0x1f053,
-	BNXT_ULP_CLASS_HID_1ccef = 0x1ccef,
-	BNXT_ULP_CLASS_HID_1ef2f = 0x1ef2f,
-	BNXT_ULP_CLASS_HID_1d26f = 0x1d26f,
-	BNXT_ULP_CLASS_HID_1f4af = 0x1f4af,
-	BNXT_ULP_CLASS_HID_da73 = 0xda73,
-	BNXT_ULP_CLASS_HID_a067 = 0xa067,
-	BNXT_ULP_CLASS_HID_c2a7 = 0xc2a7,
-	BNXT_ULP_CLASS_HID_e5e7 = 0xe5e7,
-	BNXT_ULP_CLASS_HID_d527 = 0xd527,
-	BNXT_ULP_CLASS_HID_f867 = 0xf867,
-	BNXT_ULP_CLASS_HID_daa7 = 0xdaa7,
-	BNXT_ULP_CLASS_HID_e0ab = 0xe0ab,
-	BNXT_ULP_CLASS_HID_18eeb = 0x18eeb,
-	BNXT_ULP_CLASS_HID_1b12b = 0x1b12b,
-	BNXT_ULP_CLASS_HID_1d46b = 0x1d46b,
-	BNXT_ULP_CLASS_HID_1f6ab = 0x1f6ab,
-	BNXT_ULP_CLASS_HID_19327 = 0x19327,
-	BNXT_ULP_CLASS_HID_1b667 = 0x1b667,
-	BNXT_ULP_CLASS_HID_1d8a7 = 0x1d8a7,
-	BNXT_ULP_CLASS_HID_1fbe7 = 0x1fbe7,
-	BNXT_ULP_CLASS_HID_a14b = 0xa14b,
-	BNXT_ULP_CLASS_HID_a38b = 0xa38b,
-	BNXT_ULP_CLASS_HID_e6cb = 0xe6cb,
-	BNXT_ULP_CLASS_HID_e90b = 0xe90b,
-	BNXT_ULP_CLASS_HID_9c7f = 0x9c7f,
-	BNXT_ULP_CLASS_HID_bebf = 0xbebf,
-	BNXT_ULP_CLASS_HID_e1ff = 0xe1ff,
-	BNXT_ULP_CLASS_HID_e43f = 0xe43f,
-	BNXT_ULP_CLASS_HID_1b27f = 0x1b27f,
-	BNXT_ULP_CLASS_HID_1b4bf = 0x1b4bf,
-	BNXT_ULP_CLASS_HID_1f7ff = 0x1f7ff,
-	BNXT_ULP_CLASS_HID_1fa3f = 0x1fa3f,
-	BNXT_ULP_CLASS_HID_1b74b = 0x1b74b,
-	BNXT_ULP_CLASS_HID_1b98b = 0x1b98b,
-	BNXT_ULP_CLASS_HID_1fccb = 0x1fccb,
-	BNXT_ULP_CLASS_HID_1ff0b = 0x1ff0b,
-	BNXT_ULP_CLASS_HID_c4df = 0xc4df,
-	BNXT_ULP_CLASS_HID_e71f = 0xe71f,
-	BNXT_ULP_CLASS_HID_ca5f = 0xca5f,
-	BNXT_ULP_CLASS_HID_ec9f = 0xec9f,
-	BNXT_ULP_CLASS_HID_bf83 = 0xbf83,
-	BNXT_ULP_CLASS_HID_e2c3 = 0xe2c3,
-	BNXT_ULP_CLASS_HID_c503 = 0xc503,
-	BNXT_ULP_CLASS_HID_e843 = 0xe843,
-	BNXT_ULP_CLASS_HID_1d583 = 0x1d583,
-	BNXT_ULP_CLASS_HID_1f8c3 = 0x1f8c3,
-	BNXT_ULP_CLASS_HID_1db03 = 0x1db03,
-	BNXT_ULP_CLASS_HID_1e177 = 0x1e177,
-	BNXT_ULP_CLASS_HID_1dadf = 0x1dadf,
-	BNXT_ULP_CLASS_HID_1a0c3 = 0x1a0c3,
-	BNXT_ULP_CLASS_HID_1c303 = 0x1c303,
-	BNXT_ULP_CLASS_HID_1e643 = 0x1e643,
-	BNXT_ULP_CLASS_HID_b023 = 0xb023,
-	BNXT_ULP_CLASS_HID_b363 = 0xb363,
-	BNXT_ULP_CLASS_HID_f5a3 = 0xf5a3,
-	BNXT_ULP_CLASS_HID_f8e3 = 0xf8e3,
-	BNXT_ULP_CLASS_HID_abd7 = 0xabd7,
-	BNXT_ULP_CLASS_HID_ae17 = 0xae17,
-	BNXT_ULP_CLASS_HID_f157 = 0xf157,
-	BNXT_ULP_CLASS_HID_f397 = 0xf397,
-	BNXT_ULP_CLASS_HID_1c1d7 = 0x1c1d7,
-	BNXT_ULP_CLASS_HID_1e417 = 0x1e417,
-	BNXT_ULP_CLASS_HID_1c757 = 0x1c757,
-	BNXT_ULP_CLASS_HID_1e997 = 0x1e997,
-	BNXT_ULP_CLASS_HID_1c623 = 0x1c623,
-	BNXT_ULP_CLASS_HID_1e963 = 0x1e963,
-	BNXT_ULP_CLASS_HID_1cba3 = 0x1cba3,
-	BNXT_ULP_CLASS_HID_1eee3 = 0x1eee3,
-	BNXT_ULP_CLASS_HID_d3b7 = 0xd3b7,
-	BNXT_ULP_CLASS_HID_f6f7 = 0xf6f7,
-	BNXT_ULP_CLASS_HID_d937 = 0xd937,
-	BNXT_ULP_CLASS_HID_fc77 = 0xfc77,
-	BNXT_ULP_CLASS_HID_cf7b = 0xcf7b,
-	BNXT_ULP_CLASS_HID_f1bb = 0xf1bb,
-	BNXT_ULP_CLASS_HID_d4fb = 0xd4fb,
-	BNXT_ULP_CLASS_HID_f73b = 0xf73b,
-	BNXT_ULP_CLASS_HID_1882f = 0x1882f,
-	BNXT_ULP_CLASS_HID_1ab6f = 0x1ab6f,
-	BNXT_ULP_CLASS_HID_1cdaf = 0x1cdaf,
-	BNXT_ULP_CLASS_HID_1f0ef = 0x1f0ef,
-	BNXT_ULP_CLASS_HID_18d7b = 0x18d7b,
-	BNXT_ULP_CLASS_HID_1afbb = 0x1afbb,
-	BNXT_ULP_CLASS_HID_1d2fb = 0x1d2fb,
-	BNXT_ULP_CLASS_HID_1f53b = 0x1f53b,
-	BNXT_ULP_CLASS_HID_9a8f = 0x9a8f,
-	BNXT_ULP_CLASS_HID_bdcf = 0xbdcf,
-	BNXT_ULP_CLASS_HID_e00f = 0xe00f,
-	BNXT_ULP_CLASS_HID_e34f = 0xe34f,
-	BNXT_ULP_CLASS_HID_95b3 = 0x95b3,
-	BNXT_ULP_CLASS_HID_b8f3 = 0xb8f3,
-	BNXT_ULP_CLASS_HID_db33 = 0xdb33,
-	BNXT_ULP_CLASS_HID_fe73 = 0xfe73,
-	BNXT_ULP_CLASS_HID_1abb3 = 0x1abb3,
-	BNXT_ULP_CLASS_HID_1aef3 = 0x1aef3,
-	BNXT_ULP_CLASS_HID_1f133 = 0x1f133,
-	BNXT_ULP_CLASS_HID_1f473 = 0x1f473,
-	BNXT_ULP_CLASS_HID_1b08f = 0x1b08f,
-	BNXT_ULP_CLASS_HID_1b3cf = 0x1b3cf,
-	BNXT_ULP_CLASS_HID_1f60f = 0x1f60f,
-	BNXT_ULP_CLASS_HID_1f94f = 0x1f94f,
-	BNXT_ULP_CLASS_HID_be13 = 0xbe13,
-	BNXT_ULP_CLASS_HID_e153 = 0xe153,
-	BNXT_ULP_CLASS_HID_c393 = 0xc393,
-	BNXT_ULP_CLASS_HID_e6d3 = 0xe6d3,
-	BNXT_ULP_CLASS_HID_b9c7 = 0xb9c7,
-	BNXT_ULP_CLASS_HID_bc07 = 0xbc07,
-	BNXT_ULP_CLASS_HID_ff47 = 0xff47,
-	BNXT_ULP_CLASS_HID_e187 = 0xe187,
-	BNXT_ULP_CLASS_HID_1cfc7 = 0x1cfc7,
-	BNXT_ULP_CLASS_HID_1f207 = 0x1f207,
-	BNXT_ULP_CLASS_HID_1d547 = 0x1d547,
-	BNXT_ULP_CLASS_HID_1f787 = 0x1f787,
-	BNXT_ULP_CLASS_HID_1d413 = 0x1d413,
-	BNXT_ULP_CLASS_HID_1f753 = 0x1f753,
-	BNXT_ULP_CLASS_HID_1d993 = 0x1d993,
-	BNXT_ULP_CLASS_HID_1fcd3 = 0x1fcd3,
-	BNXT_ULP_CLASS_HID_aa67 = 0xaa67,
-	BNXT_ULP_CLASS_HID_aca7 = 0xaca7,
-	BNXT_ULP_CLASS_HID_efe7 = 0xefe7,
-	BNXT_ULP_CLASS_HID_f227 = 0xf227,
-	BNXT_ULP_CLASS_HID_a52b = 0xa52b,
-	BNXT_ULP_CLASS_HID_a86b = 0xa86b,
-	BNXT_ULP_CLASS_HID_eaab = 0xeaab,
-	BNXT_ULP_CLASS_HID_edeb = 0xedeb,
-	BNXT_ULP_CLASS_HID_1bb2b = 0x1bb2b,
-	BNXT_ULP_CLASS_HID_1be6b = 0x1be6b,
-	BNXT_ULP_CLASS_HID_1c0ab = 0x1c0ab,
-	BNXT_ULP_CLASS_HID_1e3eb = 0x1e3eb,
-	BNXT_ULP_CLASS_HID_1c067 = 0x1c067,
-	BNXT_ULP_CLASS_HID_1e2a7 = 0x1e2a7,
-	BNXT_ULP_CLASS_HID_1c5e7 = 0x1c5e7,
-	BNXT_ULP_CLASS_HID_1e827 = 0x1e827,
-	BNXT_ULP_CLASS_HID_cd8b = 0xcd8b,
-	BNXT_ULP_CLASS_HID_f0cb = 0xf0cb,
-	BNXT_ULP_CLASS_HID_d30b = 0xd30b,
-	BNXT_ULP_CLASS_HID_f64b = 0xf64b,
-	BNXT_ULP_CLASS_HID_c8bf = 0xc8bf,
-	BNXT_ULP_CLASS_HID_ebff = 0xebff,
-	BNXT_ULP_CLASS_HID_ce3f = 0xce3f,
-	BNXT_ULP_CLASS_HID_f17f = 0xf17f,
-	BNXT_ULP_CLASS_HID_18263 = 0x18263,
-	BNXT_ULP_CLASS_HID_1a4a3 = 0x1a4a3,
-	BNXT_ULP_CLASS_HID_1c7e3 = 0x1c7e3,
-	BNXT_ULP_CLASS_HID_1ea23 = 0x1ea23,
-	BNXT_ULP_CLASS_HID_186bf = 0x186bf,
-	BNXT_ULP_CLASS_HID_1a9ff = 0x1a9ff,
-	BNXT_ULP_CLASS_HID_1cc3f = 0x1cc3f,
-	BNXT_ULP_CLASS_HID_1ef7f = 0x1ef7f,
-	BNXT_ULP_CLASS_HID_94c3 = 0x94c3,
-	BNXT_ULP_CLASS_HID_b703 = 0xb703,
-	BNXT_ULP_CLASS_HID_da43 = 0xda43,
-	BNXT_ULP_CLASS_HID_fc83 = 0xfc83,
-	BNXT_ULP_CLASS_HID_8ff7 = 0x8ff7,
-	BNXT_ULP_CLASS_HID_b237 = 0xb237,
-	BNXT_ULP_CLASS_HID_d577 = 0xd577,
-	BNXT_ULP_CLASS_HID_f7b7 = 0xf7b7,
-	BNXT_ULP_CLASS_HID_1a5f7 = 0x1a5f7,
-	BNXT_ULP_CLASS_HID_1a837 = 0x1a837,
-	BNXT_ULP_CLASS_HID_1eb77 = 0x1eb77,
-	BNXT_ULP_CLASS_HID_1edb7 = 0x1edb7,
-	BNXT_ULP_CLASS_HID_1aac3 = 0x1aac3,
-	BNXT_ULP_CLASS_HID_1ad03 = 0x1ad03,
-	BNXT_ULP_CLASS_HID_1f043 = 0x1f043,
-	BNXT_ULP_CLASS_HID_1f283 = 0x1f283,
+	BNXT_ULP_CLASS_HID_1fcb3 = 0x1fcb3,
+	BNXT_ULP_CLASS_HID_1f677 = 0x1f677,
+	BNXT_ULP_CLASS_HID_1e623 = 0x1e623,
+	BNXT_ULP_CLASS_HID_5fd4f = 0x5fd4f,
+	BNXT_ULP_CLASS_HID_5e9f7 = 0x5e9f7,
+	BNXT_ULP_CLASS_HID_5e38b = 0x5e38b,
+	BNXT_ULP_CLASS_HID_5f033 = 0x5f033,
+	BNXT_ULP_CLASS_HID_5e7eb = 0x5e7eb,
+	BNXT_ULP_CLASS_HID_5f413 = 0x5f413,
+	BNXT_ULP_CLASS_HID_5edd7 = 0x5edd7,
+	BNXT_ULP_CLASS_HID_5fa5f = 0x5fa5f,
+	BNXT_ULP_CLASS_HID_5e407 = 0x5e407,
+	BNXT_ULP_CLASS_HID_5f08f = 0x5f08f,
+	BNXT_ULP_CLASS_HID_5ea43 = 0x5ea43,
+	BNXT_ULP_CLASS_HID_5f6cb = 0x5f6cb,
+	BNXT_ULP_CLASS_HID_5eb7f = 0x5eb7f,
+	BNXT_ULP_CLASS_HID_5f7e7 = 0x5f7e7,
+	BNXT_ULP_CLASS_HID_5f1bb = 0x5f1bb,
+	BNXT_ULP_CLASS_HID_5e117 = 0x5e117,
+	BNXT_ULP_CLASS_HID_244a3 = 0x244a3,
+	BNXT_ULP_CLASS_HID_2513b = 0x2513b,
+	BNXT_ULP_CLASS_HID_24b7f = 0x24b7f,
+	BNXT_ULP_CLASS_HID_257f7 = 0x257f7,
+	BNXT_ULP_CLASS_HID_22f1f = 0x22f1f,
+	BNXT_ULP_CLASS_HID_23b97 = 0x23b97,
+	BNXT_ULP_CLASS_HID_235db = 0x235db,
+	BNXT_ULP_CLASS_HID_24253 = 0x24253,
+	BNXT_ULP_CLASS_HID_20beb = 0x20beb,
+	BNXT_ULP_CLASS_HID_21863 = 0x21863,
+	BNXT_ULP_CLASS_HID_211a7 = 0x211a7,
+	BNXT_ULP_CLASS_HID_21e3f = 0x21e3f,
+	BNXT_ULP_CLASS_HID_252b3 = 0x252b3,
+	BNXT_ULP_CLASS_HID_202df = 0x202df,
+	BNXT_ULP_CLASS_HID_2594f = 0x2594f,
+	BNXT_ULP_CLASS_HID_2089b = 0x2089b,
+	BNXT_ULP_CLASS_HID_23193 = 0x23193,
+	BNXT_ULP_CLASS_HID_23e6b = 0x23e6b,
+	BNXT_ULP_CLASS_HID_237af = 0x237af,
+	BNXT_ULP_CLASS_HID_24427 = 0x24427,
+	BNXT_ULP_CLASS_HID_21c4f = 0x21c4f,
+	BNXT_ULP_CLASS_HID_228c7 = 0x228c7,
+	BNXT_ULP_CLASS_HID_2220b = 0x2220b,
+	BNXT_ULP_CLASS_HID_22e83 = 0x22e83,
+	BNXT_ULP_CLASS_HID_25507 = 0x25507,
+	BNXT_ULP_CLASS_HID_20553 = 0x20553,
+	BNXT_ULP_CLASS_HID_25bc3 = 0x25bc3,
+	BNXT_ULP_CLASS_HID_20b6f = 0x20b6f,
+	BNXT_ULP_CLASS_HID_23fe3 = 0x23fe3,
+	BNXT_ULP_CLASS_HID_24c7b = 0x24c7b,
+	BNXT_ULP_CLASS_HID_245bf = 0x245bf,
+	BNXT_ULP_CLASS_HID_25237 = 0x25237,
+	BNXT_ULP_CLASS_HID_64077 = 0x64077,
+	BNXT_ULP_CLASS_HID_64ccf = 0x64ccf,
+	BNXT_ULP_CLASS_HID_64633 = 0x64633,
+	BNXT_ULP_CLASS_HID_6528b = 0x6528b,
+	BNXT_ULP_CLASS_HID_62ad3 = 0x62ad3,
+	BNXT_ULP_CLASS_HID_636ab = 0x636ab,
+	BNXT_ULP_CLASS_HID_630ef = 0x630ef,
+	BNXT_ULP_CLASS_HID_63d67 = 0x63d67,
+	BNXT_ULP_CLASS_HID_606bf = 0x606bf,
+	BNXT_ULP_CLASS_HID_61337 = 0x61337,
+	BNXT_ULP_CLASS_HID_60d7b = 0x60d7b,
+	BNXT_ULP_CLASS_HID_619f3 = 0x619f3,
+	BNXT_ULP_CLASS_HID_64e47 = 0x64e47,
+	BNXT_ULP_CLASS_HID_65adf = 0x65adf,
+	BNXT_ULP_CLASS_HID_65403 = 0x65403,
+	BNXT_ULP_CLASS_HID_603af = 0x603af,
+	BNXT_ULP_CLASS_HID_62ca7 = 0x62ca7,
+	BNXT_ULP_CLASS_HID_6393f = 0x6393f,
+	BNXT_ULP_CLASS_HID_63363 = 0x63363,
+	BNXT_ULP_CLASS_HID_63ffb = 0x63ffb,
+	BNXT_ULP_CLASS_HID_61703 = 0x61703,
+	BNXT_ULP_CLASS_HID_6239b = 0x6239b,
+	BNXT_ULP_CLASS_HID_61ddf = 0x61ddf,
+	BNXT_ULP_CLASS_HID_62a57 = 0x62a57,
+	BNXT_ULP_CLASS_HID_650db = 0x650db,
+	BNXT_ULP_CLASS_HID_60067 = 0x60067,
+	BNXT_ULP_CLASS_HID_65697 = 0x65697,
+	BNXT_ULP_CLASS_HID_60623 = 0x60623,
+	BNXT_ULP_CLASS_HID_63ab7 = 0x63ab7,
+	BNXT_ULP_CLASS_HID_6470f = 0x6470f,
+	BNXT_ULP_CLASS_HID_64173 = 0x64173,
+	BNXT_ULP_CLASS_HID_64dcb = 0x64dcb,
+	BNXT_ULP_CLASS_HID_35aa3 = 0x35aa3,
+	BNXT_ULP_CLASS_HID_30acf = 0x30acf,
+	BNXT_ULP_CLASS_HID_30433 = 0x30433,
+	BNXT_ULP_CLASS_HID_3108b = 0x3108b,
+	BNXT_ULP_CLASS_HID_3451f = 0x3451f,
+	BNXT_ULP_CLASS_HID_35197 = 0x35197,
+	BNXT_ULP_CLASS_HID_34bdb = 0x34bdb,
+	BNXT_ULP_CLASS_HID_35853 = 0x35853,
+	BNXT_ULP_CLASS_HID_321eb = 0x321eb,
+	BNXT_ULP_CLASS_HID_32e63 = 0x32e63,
+	BNXT_ULP_CLASS_HID_327a7 = 0x327a7,
+	BNXT_ULP_CLASS_HID_3343f = 0x3343f,
+	BNXT_ULP_CLASS_HID_30c47 = 0x30c47,
+	BNXT_ULP_CLASS_HID_318df = 0x318df,
+	BNXT_ULP_CLASS_HID_31203 = 0x31203,
+	BNXT_ULP_CLASS_HID_31e9b = 0x31e9b,
+	BNXT_ULP_CLASS_HID_34793 = 0x34793,
+	BNXT_ULP_CLASS_HID_3546b = 0x3546b,
+	BNXT_ULP_CLASS_HID_34daf = 0x34daf,
+	BNXT_ULP_CLASS_HID_35a27 = 0x35a27,
+	BNXT_ULP_CLASS_HID_3324f = 0x3324f,
+	BNXT_ULP_CLASS_HID_33ec7 = 0x33ec7,
+	BNXT_ULP_CLASS_HID_3380b = 0x3380b,
+	BNXT_ULP_CLASS_HID_34483 = 0x34483,
+	BNXT_ULP_CLASS_HID_30edb = 0x30edb,
+	BNXT_ULP_CLASS_HID_31b53 = 0x31b53,
+	BNXT_ULP_CLASS_HID_31497 = 0x31497,
+	BNXT_ULP_CLASS_HID_3216f = 0x3216f,
+	BNXT_ULP_CLASS_HID_355e3 = 0x355e3,
+	BNXT_ULP_CLASS_HID_3050f = 0x3050f,
+	BNXT_ULP_CLASS_HID_35bbf = 0x35bbf,
+	BNXT_ULP_CLASS_HID_30bcb = 0x30bcb,
+	BNXT_ULP_CLASS_HID_75677 = 0x75677,
+	BNXT_ULP_CLASS_HID_70583 = 0x70583,
+	BNXT_ULP_CLASS_HID_75c33 = 0x75c33,
+	BNXT_ULP_CLASS_HID_70c5f = 0x70c5f,
+	BNXT_ULP_CLASS_HID_740d3 = 0x740d3,
+	BNXT_ULP_CLASS_HID_74cab = 0x74cab,
+	BNXT_ULP_CLASS_HID_746ef = 0x746ef,
+	BNXT_ULP_CLASS_HID_75367 = 0x75367,
+	BNXT_ULP_CLASS_HID_71cbf = 0x71cbf,
+	BNXT_ULP_CLASS_HID_72937 = 0x72937,
+	BNXT_ULP_CLASS_HID_7237b = 0x7237b,
+	BNXT_ULP_CLASS_HID_72ff3 = 0x72ff3,
+	BNXT_ULP_CLASS_HID_7071b = 0x7071b,
+	BNXT_ULP_CLASS_HID_71393 = 0x71393,
+	BNXT_ULP_CLASS_HID_70dd7 = 0x70dd7,
+	BNXT_ULP_CLASS_HID_719af = 0x719af,
+	BNXT_ULP_CLASS_HID_742a7 = 0x742a7,
+	BNXT_ULP_CLASS_HID_74f3f = 0x74f3f,
+	BNXT_ULP_CLASS_HID_74963 = 0x74963,
+	BNXT_ULP_CLASS_HID_755fb = 0x755fb,
+	BNXT_ULP_CLASS_HID_72d03 = 0x72d03,
+	BNXT_ULP_CLASS_HID_7399b = 0x7399b,
+	BNXT_ULP_CLASS_HID_733df = 0x733df,
+	BNXT_ULP_CLASS_HID_74057 = 0x74057,
+	BNXT_ULP_CLASS_HID_709ef = 0x709ef,
+	BNXT_ULP_CLASS_HID_71667 = 0x71667,
+	BNXT_ULP_CLASS_HID_70fab = 0x70fab,
+	BNXT_ULP_CLASS_HID_71c23 = 0x71c23,
+	BNXT_ULP_CLASS_HID_750b7 = 0x750b7,
+	BNXT_ULP_CLASS_HID_700c3 = 0x700c3,
+	BNXT_ULP_CLASS_HID_75773 = 0x75773,
+	BNXT_ULP_CLASS_HID_7069f = 0x7069f,
+	BNXT_ULP_CLASS_HID_2cfa3 = 0x2cfa3,
+	BNXT_ULP_CLASS_HID_2dc3b = 0x2dc3b,
+	BNXT_ULP_CLASS_HID_2d67f = 0x2d67f,
+	BNXT_ULP_CLASS_HID_2858b = 0x2858b,
+	BNXT_ULP_CLASS_HID_2ba1f = 0x2ba1f,
+	BNXT_ULP_CLASS_HID_2c697 = 0x2c697,
+	BNXT_ULP_CLASS_HID_2c0db = 0x2c0db,
+	BNXT_ULP_CLASS_HID_2cd53 = 0x2cd53,
+	BNXT_ULP_CLASS_HID_296eb = 0x296eb,
+	BNXT_ULP_CLASS_HID_2a363 = 0x2a363,
+	BNXT_ULP_CLASS_HID_29ca7 = 0x29ca7,
+	BNXT_ULP_CLASS_HID_2a93f = 0x2a93f,
+	BNXT_ULP_CLASS_HID_28147 = 0x28147,
+	BNXT_ULP_CLASS_HID_28ddf = 0x28ddf,
+	BNXT_ULP_CLASS_HID_28703 = 0x28703,
+	BNXT_ULP_CLASS_HID_2939b = 0x2939b,
+	BNXT_ULP_CLASS_HID_2bc93 = 0x2bc93,
+	BNXT_ULP_CLASS_HID_2c96b = 0x2c96b,
+	BNXT_ULP_CLASS_HID_2c2af = 0x2c2af,
+	BNXT_ULP_CLASS_HID_2cf27 = 0x2cf27,
+	BNXT_ULP_CLASS_HID_2a74f = 0x2a74f,
+	BNXT_ULP_CLASS_HID_2b3c7 = 0x2b3c7,
+	BNXT_ULP_CLASS_HID_2ad0b = 0x2ad0b,
+	BNXT_ULP_CLASS_HID_2b983 = 0x2b983,
+	BNXT_ULP_CLASS_HID_283db = 0x283db,
+	BNXT_ULP_CLASS_HID_29053 = 0x29053,
+	BNXT_ULP_CLASS_HID_28997 = 0x28997,
+	BNXT_ULP_CLASS_HID_2966f = 0x2966f,
+	BNXT_ULP_CLASS_HID_2cae3 = 0x2cae3,
+	BNXT_ULP_CLASS_HID_2d77b = 0x2d77b,
+	BNXT_ULP_CLASS_HID_2d0bf = 0x2d0bf,
+	BNXT_ULP_CLASS_HID_280cb = 0x280cb,
+	BNXT_ULP_CLASS_HID_6cb77 = 0x6cb77,
+	BNXT_ULP_CLASS_HID_6d7cf = 0x6d7cf,
+	BNXT_ULP_CLASS_HID_6d133 = 0x6d133,
+	BNXT_ULP_CLASS_HID_6815f = 0x6815f,
+	BNXT_ULP_CLASS_HID_6b5d3 = 0x6b5d3,
+	BNXT_ULP_CLASS_HID_6c1ab = 0x6c1ab,
+	BNXT_ULP_CLASS_HID_6bbef = 0x6bbef,
+	BNXT_ULP_CLASS_HID_6c867 = 0x6c867,
+	BNXT_ULP_CLASS_HID_691bf = 0x691bf,
+	BNXT_ULP_CLASS_HID_69e37 = 0x69e37,
+	BNXT_ULP_CLASS_HID_6987b = 0x6987b,
+	BNXT_ULP_CLASS_HID_6a4f3 = 0x6a4f3,
+	BNXT_ULP_CLASS_HID_6d947 = 0x6d947,
+	BNXT_ULP_CLASS_HID_68893 = 0x68893,
+	BNXT_ULP_CLASS_HID_682d7 = 0x682d7,
+	BNXT_ULP_CLASS_HID_68eaf = 0x68eaf,
+	BNXT_ULP_CLASS_HID_6b7a7 = 0x6b7a7,
+	BNXT_ULP_CLASS_HID_6c43f = 0x6c43f,
+	BNXT_ULP_CLASS_HID_6be63 = 0x6be63,
+	BNXT_ULP_CLASS_HID_6cafb = 0x6cafb,
+	BNXT_ULP_CLASS_HID_6a203 = 0x6a203,
+	BNXT_ULP_CLASS_HID_6ae9b = 0x6ae9b,
+	BNXT_ULP_CLASS_HID_6a8df = 0x6a8df,
+	BNXT_ULP_CLASS_HID_6b557 = 0x6b557,
+	BNXT_ULP_CLASS_HID_6dbdb = 0x6dbdb,
+	BNXT_ULP_CLASS_HID_68b67 = 0x68b67,
+	BNXT_ULP_CLASS_HID_684ab = 0x684ab,
+	BNXT_ULP_CLASS_HID_69123 = 0x69123,
+	BNXT_ULP_CLASS_HID_6c5b7 = 0x6c5b7,
+	BNXT_ULP_CLASS_HID_6d20f = 0x6d20f,
+	BNXT_ULP_CLASS_HID_6cc73 = 0x6cc73,
+	BNXT_ULP_CLASS_HID_6d8cb = 0x6d8cb,
+	BNXT_ULP_CLASS_HID_38977 = 0x38977,
+	BNXT_ULP_CLASS_HID_395cf = 0x395cf,
+	BNXT_ULP_CLASS_HID_38f33 = 0x38f33,
+	BNXT_ULP_CLASS_HID_39b8b = 0x39b8b,
+	BNXT_ULP_CLASS_HID_3d01f = 0x3d01f,
+	BNXT_ULP_CLASS_HID_3dc97 = 0x3dc97,
+	BNXT_ULP_CLASS_HID_3d6db = 0x3d6db,
+	BNXT_ULP_CLASS_HID_38667 = 0x38667,
+	BNXT_ULP_CLASS_HID_3aceb = 0x3aceb,
+	BNXT_ULP_CLASS_HID_3b963 = 0x3b963,
+	BNXT_ULP_CLASS_HID_3b2a7 = 0x3b2a7,
+	BNXT_ULP_CLASS_HID_3bf3f = 0x3bf3f,
+	BNXT_ULP_CLASS_HID_39747 = 0x39747,
+	BNXT_ULP_CLASS_HID_3a3df = 0x3a3df,
+	BNXT_ULP_CLASS_HID_39d03 = 0x39d03,
+	BNXT_ULP_CLASS_HID_3a99b = 0x3a99b,
+	BNXT_ULP_CLASS_HID_3d293 = 0x3d293,
+	BNXT_ULP_CLASS_HID_3823f = 0x3823f,
+	BNXT_ULP_CLASS_HID_3d8af = 0x3d8af,
+	BNXT_ULP_CLASS_HID_388fb = 0x388fb,
+	BNXT_ULP_CLASS_HID_3bd4f = 0x3bd4f,
+	BNXT_ULP_CLASS_HID_3c9c7 = 0x3c9c7,
+	BNXT_ULP_CLASS_HID_3c30b = 0x3c30b,
+	BNXT_ULP_CLASS_HID_3cf83 = 0x3cf83,
+	BNXT_ULP_CLASS_HID_399db = 0x399db,
+	BNXT_ULP_CLASS_HID_3a653 = 0x3a653,
+	BNXT_ULP_CLASS_HID_39f97 = 0x39f97,
+	BNXT_ULP_CLASS_HID_3ac6f = 0x3ac6f,
+	BNXT_ULP_CLASS_HID_383b7 = 0x383b7,
+	BNXT_ULP_CLASS_HID_3900f = 0x3900f,
+	BNXT_ULP_CLASS_HID_38a73 = 0x38a73,
+	BNXT_ULP_CLASS_HID_396cb = 0x396cb,
+	BNXT_ULP_CLASS_HID_7840b = 0x7840b,
+	BNXT_ULP_CLASS_HID_79083 = 0x79083,
+	BNXT_ULP_CLASS_HID_78ac7 = 0x78ac7,
+	BNXT_ULP_CLASS_HID_7975f = 0x7975f,
+	BNXT_ULP_CLASS_HID_7cbd3 = 0x7cbd3,
+	BNXT_ULP_CLASS_HID_7d7ab = 0x7d7ab,
+	BNXT_ULP_CLASS_HID_7d1ef = 0x7d1ef,
+	BNXT_ULP_CLASS_HID_7813b = 0x7813b,
+	BNXT_ULP_CLASS_HID_7a7bf = 0x7a7bf,
+	BNXT_ULP_CLASS_HID_7b437 = 0x7b437,
+	BNXT_ULP_CLASS_HID_7ae7b = 0x7ae7b,
+	BNXT_ULP_CLASS_HID_7baf3 = 0x7baf3,
+	BNXT_ULP_CLASS_HID_7921b = 0x7921b,
+	BNXT_ULP_CLASS_HID_79e93 = 0x79e93,
+	BNXT_ULP_CLASS_HID_798d7 = 0x798d7,
+	BNXT_ULP_CLASS_HID_7a4af = 0x7a4af,
+	BNXT_ULP_CLASS_HID_7cda7 = 0x7cda7,
+	BNXT_ULP_CLASS_HID_7da3f = 0x7da3f,
+	BNXT_ULP_CLASS_HID_7d463 = 0x7d463,
+	BNXT_ULP_CLASS_HID_7838f = 0x7838f,
+	BNXT_ULP_CLASS_HID_7b803 = 0x7b803,
+	BNXT_ULP_CLASS_HID_7c49b = 0x7c49b,
+	BNXT_ULP_CLASS_HID_7bedf = 0x7bedf,
+	BNXT_ULP_CLASS_HID_7cb57 = 0x7cb57,
+	BNXT_ULP_CLASS_HID_794ef = 0x794ef,
+	BNXT_ULP_CLASS_HID_7a167 = 0x7a167,
+	BNXT_ULP_CLASS_HID_79aab = 0x79aab,
+	BNXT_ULP_CLASS_HID_7a723 = 0x7a723,
+	BNXT_ULP_CLASS_HID_7dbb7 = 0x7dbb7,
+	BNXT_ULP_CLASS_HID_78bc3 = 0x78bc3,
+	BNXT_ULP_CLASS_HID_78507 = 0x78507,
+	BNXT_ULP_CLASS_HID_7919f = 0x7919f,
+	BNXT_ULP_CLASS_HID_a3bb = 0xa3bb,
+	BNXT_ULP_CLASS_HID_b023 = 0xb023,
+	BNXT_ULP_CLASS_HID_aa67 = 0xaa67,
+	BNXT_ULP_CLASS_HID_b6ef = 0xb6ef,
+	BNXT_ULP_CLASS_HID_8e07 = 0x8e07,
+	BNXT_ULP_CLASS_HID_9a8f = 0x9a8f,
+	BNXT_ULP_CLASS_HID_94c3 = 0x94c3,
+	BNXT_ULP_CLASS_HID_a14b = 0xa14b,
+	BNXT_ULP_CLASS_HID_c7cf = 0xc7cf,
+	BNXT_ULP_CLASS_HID_d3b7 = 0xd3b7,
+	BNXT_ULP_CLASS_HID_cd8b = 0xcd8b,
+	BNXT_ULP_CLASS_HID_da73 = 0xda73,
+	BNXT_ULP_CLASS_HID_b1ab = 0xb1ab,
+	BNXT_ULP_CLASS_HID_be13 = 0xbe13,
 	BNXT_ULP_CLASS_HID_b857 = 0xb857,
-	BNXT_ULP_CLASS_HID_ba97 = 0xba97,
-	BNXT_ULP_CLASS_HID_fdd7 = 0xfdd7,
-	BNXT_ULP_CLASS_HID_e017 = 0xe017,
-	BNXT_ULP_CLASS_HID_b31b = 0xb31b,
-	BNXT_ULP_CLASS_HID_b65b = 0xb65b,
-	BNXT_ULP_CLASS_HID_f89b = 0xf89b,
-	BNXT_ULP_CLASS_HID_fbdb = 0xfbdb,
-	BNXT_ULP_CLASS_HID_1c91b = 0x1c91b,
-	BNXT_ULP_CLASS_HID_1ec5b = 0x1ec5b,
-	BNXT_ULP_CLASS_HID_1ce9b = 0x1ce9b,
-	BNXT_ULP_CLASS_HID_1f1db = 0x1f1db,
+	BNXT_ULP_CLASS_HID_c4df = 0xc4df,
+	BNXT_ULP_CLASS_HID_49f6f = 0x49f6f,
+	BNXT_ULP_CLASS_HID_4abd7 = 0x4abd7,
+	BNXT_ULP_CLASS_HID_4a52b = 0x4a52b,
+	BNXT_ULP_CLASS_HID_4b193 = 0x4b193,
+	BNXT_ULP_CLASS_HID_489cb = 0x489cb,
+	BNXT_ULP_CLASS_HID_495b3 = 0x495b3,
+	BNXT_ULP_CLASS_HID_48ff7 = 0x48ff7,
+	BNXT_ULP_CLASS_HID_49c7f = 0x49c7f,
+	BNXT_ULP_CLASS_HID_4c2f3 = 0x4c2f3,
+	BNXT_ULP_CLASS_HID_4cf7b = 0x4cf7b,
+	BNXT_ULP_CLASS_HID_4c8bf = 0x4c8bf,
+	BNXT_ULP_CLASS_HID_4d527 = 0x4d527,
+	BNXT_ULP_CLASS_HID_4ad5f = 0x4ad5f,
+	BNXT_ULP_CLASS_HID_4b9c7 = 0x4b9c7,
+	BNXT_ULP_CLASS_HID_4b31b = 0x4b31b,
+	BNXT_ULP_CLASS_HID_4bf83 = 0x4bf83,
+	BNXT_ULP_CLASS_HID_1b9bb = 0x1b9bb,
+	BNXT_ULP_CLASS_HID_1c623 = 0x1c623,
+	BNXT_ULP_CLASS_HID_1c067 = 0x1c067,
+	BNXT_ULP_CLASS_HID_1ccef = 0x1ccef,
+	BNXT_ULP_CLASS_HID_1a407 = 0x1a407,
+	BNXT_ULP_CLASS_HID_1b08f = 0x1b08f,
+	BNXT_ULP_CLASS_HID_1aac3 = 0x1aac3,
+	BNXT_ULP_CLASS_HID_1b74b = 0x1b74b,
+	BNXT_ULP_CLASS_HID_180f3 = 0x180f3,
+	BNXT_ULP_CLASS_HID_18d7b = 0x18d7b,
+	BNXT_ULP_CLASS_HID_186bf = 0x186bf,
+	BNXT_ULP_CLASS_HID_19327 = 0x19327,
+	BNXT_ULP_CLASS_HID_1c7ab = 0x1c7ab,
+	BNXT_ULP_CLASS_HID_1d413 = 0x1d413,
 	BNXT_ULP_CLASS_HID_1ce57 = 0x1ce57,
-	BNXT_ULP_CLASS_HID_1f097 = 0x1f097,
-	BNXT_ULP_CLASS_HID_1d3d7 = 0x1d3d7,
-	BNXT_ULP_CLASS_HID_1f617 = 0x1f617,
-	BNXT_ULP_CLASS_HID_a3bb = 0xa3bb,
-	BNXT_ULP_CLASS_HID_a6fb = 0xa6fb,
+	BNXT_ULP_CLASS_HID_1dadf = 0x1dadf,
+	BNXT_ULP_CLASS_HID_5b56f = 0x5b56f,
+	BNXT_ULP_CLASS_HID_5c1d7 = 0x5c1d7,
+	BNXT_ULP_CLASS_HID_5bb2b = 0x5bb2b,
+	BNXT_ULP_CLASS_HID_5c793 = 0x5c793,
+	BNXT_ULP_CLASS_HID_59fcb = 0x59fcb,
+	BNXT_ULP_CLASS_HID_5abb3 = 0x5abb3,
+	BNXT_ULP_CLASS_HID_5a5f7 = 0x5a5f7,
+	BNXT_ULP_CLASS_HID_5b27f = 0x5b27f,
+	BNXT_ULP_CLASS_HID_5d8f3 = 0x5d8f3,
+	BNXT_ULP_CLASS_HID_5882f = 0x5882f,
+	BNXT_ULP_CLASS_HID_58263 = 0x58263,
+	BNXT_ULP_CLASS_HID_58eeb = 0x58eeb,
+	BNXT_ULP_CLASS_HID_5c35f = 0x5c35f,
+	BNXT_ULP_CLASS_HID_5cfc7 = 0x5cfc7,
+	BNXT_ULP_CLASS_HID_5c91b = 0x5c91b,
+	BNXT_ULP_CLASS_HID_5d583 = 0x5d583,
 	BNXT_ULP_CLASS_HID_e93b = 0xe93b,
-	BNXT_ULP_CLASS_HID_ec7b = 0xec7b,
-	BNXT_ULP_CLASS_HID_9f6f = 0x9f6f,
-	BNXT_ULP_CLASS_HID_a1af = 0xa1af,
-	BNXT_ULP_CLASS_HID_e4ef = 0xe4ef,
-	BNXT_ULP_CLASS_HID_e72f = 0xe72f,
-	BNXT_ULP_CLASS_HID_1b56f = 0x1b56f,
-	BNXT_ULP_CLASS_HID_1b7af = 0x1b7af,
-	BNXT_ULP_CLASS_HID_1faef = 0x1faef,
-	BNXT_ULP_CLASS_HID_1fd2f = 0x1fd2f,
-	BNXT_ULP_CLASS_HID_1b9bb = 0x1b9bb,
-	BNXT_ULP_CLASS_HID_1bcfb = 0x1bcfb,
-	BNXT_ULP_CLASS_HID_1ff3b = 0x1ff3b,
-	BNXT_ULP_CLASS_HID_1e27b = 0x1e27b,
-	BNXT_ULP_CLASS_HID_c7cf = 0xc7cf,
-	BNXT_ULP_CLASS_HID_ea0f = 0xea0f,
+	BNXT_ULP_CLASS_HID_f5a3 = 0xf5a3,
+	BNXT_ULP_CLASS_HID_efe7 = 0xefe7,
+	BNXT_ULP_CLASS_HID_fc6f = 0xfc6f,
+	BNXT_ULP_CLASS_HID_d387 = 0xd387,
+	BNXT_ULP_CLASS_HID_e00f = 0xe00f,
+	BNXT_ULP_CLASS_HID_da43 = 0xda43,
+	BNXT_ULP_CLASS_HID_e6cb = 0xe6cb,
 	BNXT_ULP_CLASS_HID_cd4f = 0xcd4f,
-	BNXT_ULP_CLASS_HID_ef8f = 0xef8f,
-	BNXT_ULP_CLASS_HID_c2f3 = 0xc2f3,
-	BNXT_ULP_CLASS_HID_e533 = 0xe533,
-	BNXT_ULP_CLASS_HID_c873 = 0xc873,
-	BNXT_ULP_CLASS_HID_eab3 = 0xeab3,
-	BNXT_ULP_CLASS_HID_1d8f3 = 0x1d8f3,
-	BNXT_ULP_CLASS_HID_1fb33 = 0x1fb33,
-	BNXT_ULP_CLASS_HID_1c127 = 0x1c127,
-	BNXT_ULP_CLASS_HID_1e467 = 0x1e467,
-	BNXT_ULP_CLASS_HID_180f3 = 0x180f3,
-	BNXT_ULP_CLASS_HID_1a333 = 0x1a333,
+	BNXT_ULP_CLASS_HID_d937 = 0xd937,
+	BNXT_ULP_CLASS_HID_d30b = 0xd30b,
+	BNXT_ULP_CLASS_HID_c2a7 = 0xc2a7,
+	BNXT_ULP_CLASS_HID_f72b = 0xf72b,
+	BNXT_ULP_CLASS_HID_c393 = 0xc393,
+	BNXT_ULP_CLASS_HID_fdd7 = 0xfdd7,
+	BNXT_ULP_CLASS_HID_ca5f = 0xca5f,
+	BNXT_ULP_CLASS_HID_4e4ef = 0x4e4ef,
+	BNXT_ULP_CLASS_HID_4f157 = 0x4f157,
+	BNXT_ULP_CLASS_HID_4eaab = 0x4eaab,
+	BNXT_ULP_CLASS_HID_4f713 = 0x4f713,
+	BNXT_ULP_CLASS_HID_4cf4b = 0x4cf4b,
+	BNXT_ULP_CLASS_HID_4db33 = 0x4db33,
+	BNXT_ULP_CLASS_HID_4d577 = 0x4d577,
+	BNXT_ULP_CLASS_HID_4e1ff = 0x4e1ff,
+	BNXT_ULP_CLASS_HID_4c873 = 0x4c873,
+	BNXT_ULP_CLASS_HID_4d4fb = 0x4d4fb,
+	BNXT_ULP_CLASS_HID_4ce3f = 0x4ce3f,
+	BNXT_ULP_CLASS_HID_4daa7 = 0x4daa7,
+	BNXT_ULP_CLASS_HID_4f2df = 0x4f2df,
+	BNXT_ULP_CLASS_HID_4ff47 = 0x4ff47,
+	BNXT_ULP_CLASS_HID_4f89b = 0x4f89b,
+	BNXT_ULP_CLASS_HID_4c503 = 0x4c503,
+	BNXT_ULP_CLASS_HID_1ff3b = 0x1ff3b,
+	BNXT_ULP_CLASS_HID_1cba3 = 0x1cba3,
+	BNXT_ULP_CLASS_HID_1c5e7 = 0x1c5e7,
+	BNXT_ULP_CLASS_HID_1d26f = 0x1d26f,
+	BNXT_ULP_CLASS_HID_1e987 = 0x1e987,
+	BNXT_ULP_CLASS_HID_1f60f = 0x1f60f,
+	BNXT_ULP_CLASS_HID_1f043 = 0x1f043,
+	BNXT_ULP_CLASS_HID_1fccb = 0x1fccb,
 	BNXT_ULP_CLASS_HID_1c673 = 0x1c673,
-	BNXT_ULP_CLASS_HID_1e8b3 = 0x1e8b3,
-	BNXT_ULP_CLASS_HID_8e07 = 0x8e07,
+	BNXT_ULP_CLASS_HID_1d2fb = 0x1d2fb,
+	BNXT_ULP_CLASS_HID_1cc3f = 0x1cc3f,
+	BNXT_ULP_CLASS_HID_1d8a7 = 0x1d8a7,
+	BNXT_ULP_CLASS_HID_1cd2b = 0x1cd2b,
+	BNXT_ULP_CLASS_HID_1d993 = 0x1d993,
+	BNXT_ULP_CLASS_HID_1d3d7 = 0x1d3d7,
+	BNXT_ULP_CLASS_HID_1c303 = 0x1c303,
+	BNXT_ULP_CLASS_HID_5faef = 0x5faef,
+	BNXT_ULP_CLASS_HID_5c757 = 0x5c757,
+	BNXT_ULP_CLASS_HID_5c0ab = 0x5c0ab,
+	BNXT_ULP_CLASS_HID_5cd13 = 0x5cd13,
+	BNXT_ULP_CLASS_HID_5e54b = 0x5e54b,
+	BNXT_ULP_CLASS_HID_5f133 = 0x5f133,
+	BNXT_ULP_CLASS_HID_5eb77 = 0x5eb77,
+	BNXT_ULP_CLASS_HID_5f7ff = 0x5f7ff,
+	BNXT_ULP_CLASS_HID_5c127 = 0x5c127,
+	BNXT_ULP_CLASS_HID_5cdaf = 0x5cdaf,
+	BNXT_ULP_CLASS_HID_5c7e3 = 0x5c7e3,
+	BNXT_ULP_CLASS_HID_5d46b = 0x5d46b,
+	BNXT_ULP_CLASS_HID_5c8df = 0x5c8df,
+	BNXT_ULP_CLASS_HID_5d547 = 0x5d547,
+	BNXT_ULP_CLASS_HID_5ce9b = 0x5ce9b,
+	BNXT_ULP_CLASS_HID_5db03 = 0x5db03,
+	BNXT_ULP_CLASS_HID_a6fb = 0xa6fb,
+	BNXT_ULP_CLASS_HID_b363 = 0xb363,
+	BNXT_ULP_CLASS_HID_aca7 = 0xaca7,
+	BNXT_ULP_CLASS_HID_b92f = 0xb92f,
 	BNXT_ULP_CLASS_HID_b147 = 0xb147,
-	BNXT_ULP_CLASS_HID_d387 = 0xd387,
-	BNXT_ULP_CLASS_HID_f6c7 = 0xf6c7,
-	BNXT_ULP_CLASS_HID_89cb = 0x89cb,
-	BNXT_ULP_CLASS_HID_ac0b = 0xac0b,
-	BNXT_ULP_CLASS_HID_cf4b = 0xcf4b,
-	BNXT_ULP_CLASS_HID_f18b = 0xf18b,
-	BNXT_ULP_CLASS_HID_19fcb = 0x19fcb,
-	BNXT_ULP_CLASS_HID_1a20b = 0x1a20b,
-	BNXT_ULP_CLASS_HID_1e54b = 0x1e54b,
-	BNXT_ULP_CLASS_HID_1e78b = 0x1e78b,
-	BNXT_ULP_CLASS_HID_1a407 = 0x1a407,
-	BNXT_ULP_CLASS_HID_1a747 = 0x1a747,
-	BNXT_ULP_CLASS_HID_1e987 = 0x1e987,
-	BNXT_ULP_CLASS_HID_1ecc7 = 0x1ecc7,
-	BNXT_ULP_CLASS_HID_b1ab = 0xb1ab,
+	BNXT_ULP_CLASS_HID_bdcf = 0xbdcf,
+	BNXT_ULP_CLASS_HID_b703 = 0xb703,
+	BNXT_ULP_CLASS_HID_a38b = 0xa38b,
+	BNXT_ULP_CLASS_HID_ea0f = 0xea0f,
+	BNXT_ULP_CLASS_HID_f6f7 = 0xf6f7,
+	BNXT_ULP_CLASS_HID_f0cb = 0xf0cb,
+	BNXT_ULP_CLASS_HID_a067 = 0xa067,
 	BNXT_ULP_CLASS_HID_b4eb = 0xb4eb,
-	BNXT_ULP_CLASS_HID_f72b = 0xf72b,
-	BNXT_ULP_CLASS_HID_fa6b = 0xfa6b,
-	BNXT_ULP_CLASS_HID_ad5f = 0xad5f,
-	BNXT_ULP_CLASS_HID_af9f = 0xaf9f,
-	BNXT_ULP_CLASS_HID_f2df = 0xf2df,
-	BNXT_ULP_CLASS_HID_f51f = 0xf51f,
-	BNXT_ULP_CLASS_HID_1c35f = 0x1c35f,
-	BNXT_ULP_CLASS_HID_1e59f = 0x1e59f,
-	BNXT_ULP_CLASS_HID_1c8df = 0x1c8df,
-	BNXT_ULP_CLASS_HID_1eb1f = 0x1eb1f,
-	BNXT_ULP_CLASS_HID_1c7ab = 0x1c7ab,
+	BNXT_ULP_CLASS_HID_e153 = 0xe153,
+	BNXT_ULP_CLASS_HID_ba97 = 0xba97,
+	BNXT_ULP_CLASS_HID_e71f = 0xe71f,
+	BNXT_ULP_CLASS_HID_4a1af = 0x4a1af,
+	BNXT_ULP_CLASS_HID_4ae17 = 0x4ae17,
+	BNXT_ULP_CLASS_HID_4a86b = 0x4a86b,
+	BNXT_ULP_CLASS_HID_4b4d3 = 0x4b4d3,
+	BNXT_ULP_CLASS_HID_4ac0b = 0x4ac0b,
+	BNXT_ULP_CLASS_HID_4b8f3 = 0x4b8f3,
+	BNXT_ULP_CLASS_HID_4b237 = 0x4b237,
+	BNXT_ULP_CLASS_HID_4bebf = 0x4bebf,
+	BNXT_ULP_CLASS_HID_4e533 = 0x4e533,
+	BNXT_ULP_CLASS_HID_4f1bb = 0x4f1bb,
+	BNXT_ULP_CLASS_HID_4ebff = 0x4ebff,
+	BNXT_ULP_CLASS_HID_4f867 = 0x4f867,
+	BNXT_ULP_CLASS_HID_4af9f = 0x4af9f,
+	BNXT_ULP_CLASS_HID_4bc07 = 0x4bc07,
+	BNXT_ULP_CLASS_HID_4b65b = 0x4b65b,
+	BNXT_ULP_CLASS_HID_4e2c3 = 0x4e2c3,
+	BNXT_ULP_CLASS_HID_1bcfb = 0x1bcfb,
+	BNXT_ULP_CLASS_HID_1e963 = 0x1e963,
+	BNXT_ULP_CLASS_HID_1e2a7 = 0x1e2a7,
+	BNXT_ULP_CLASS_HID_1ef2f = 0x1ef2f,
+	BNXT_ULP_CLASS_HID_1a747 = 0x1a747,
+	BNXT_ULP_CLASS_HID_1b3cf = 0x1b3cf,
+	BNXT_ULP_CLASS_HID_1ad03 = 0x1ad03,
+	BNXT_ULP_CLASS_HID_1b98b = 0x1b98b,
+	BNXT_ULP_CLASS_HID_1a333 = 0x1a333,
+	BNXT_ULP_CLASS_HID_1afbb = 0x1afbb,
+	BNXT_ULP_CLASS_HID_1a9ff = 0x1a9ff,
+	BNXT_ULP_CLASS_HID_1b667 = 0x1b667,
 	BNXT_ULP_CLASS_HID_1eaeb = 0x1eaeb,
-	BNXT_ULP_CLASS_HID_1cd2b = 0x1cd2b,
-	BNXT_ULP_CLASS_HID_1f06b = 0x1f06b,
-	BNXT_ULP_CLASS_HID_9177 = 0x9177,
-	BNXT_ULP_CLASS_HID_b3b7 = 0xb3b7,
-	BNXT_ULP_CLASS_HID_d6f7 = 0xd6f7,
-	BNXT_ULP_CLASS_HID_f937 = 0xf937,
-	BNXT_ULP_CLASS_HID_8c3b = 0x8c3b,
-	BNXT_ULP_CLASS_HID_af7b = 0xaf7b,
-	BNXT_ULP_CLASS_HID_d1bb = 0xd1bb,
-	BNXT_ULP_CLASS_HID_f4fb = 0xf4fb,
-	BNXT_ULP_CLASS_HID_1a23b = 0x1a23b,
-	BNXT_ULP_CLASS_HID_1a57b = 0x1a57b,
-	BNXT_ULP_CLASS_HID_1e7bb = 0x1e7bb,
-	BNXT_ULP_CLASS_HID_1eafb = 0x1eafb,
-	BNXT_ULP_CLASS_HID_1a777 = 0x1a777,
-	BNXT_ULP_CLASS_HID_1a9b7 = 0x1a9b7,
-	BNXT_ULP_CLASS_HID_1ecf7 = 0x1ecf7,
-	BNXT_ULP_CLASS_HID_1ef37 = 0x1ef37,
+	BNXT_ULP_CLASS_HID_1f753 = 0x1f753,
+	BNXT_ULP_CLASS_HID_1f097 = 0x1f097,
+	BNXT_ULP_CLASS_HID_1a0c3 = 0x1a0c3,
+	BNXT_ULP_CLASS_HID_5b7af = 0x5b7af,
+	BNXT_ULP_CLASS_HID_5e417 = 0x5e417,
+	BNXT_ULP_CLASS_HID_5be6b = 0x5be6b,
+	BNXT_ULP_CLASS_HID_5ead3 = 0x5ead3,
+	BNXT_ULP_CLASS_HID_5a20b = 0x5a20b,
+	BNXT_ULP_CLASS_HID_5aef3 = 0x5aef3,
+	BNXT_ULP_CLASS_HID_5a837 = 0x5a837,
+	BNXT_ULP_CLASS_HID_5b4bf = 0x5b4bf,
+	BNXT_ULP_CLASS_HID_5fb33 = 0x5fb33,
+	BNXT_ULP_CLASS_HID_5ab6f = 0x5ab6f,
+	BNXT_ULP_CLASS_HID_5a4a3 = 0x5a4a3,
+	BNXT_ULP_CLASS_HID_5b12b = 0x5b12b,
+	BNXT_ULP_CLASS_HID_5e59f = 0x5e59f,
+	BNXT_ULP_CLASS_HID_5f207 = 0x5f207,
+	BNXT_ULP_CLASS_HID_5ec5b = 0x5ec5b,
+	BNXT_ULP_CLASS_HID_5f8c3 = 0x5f8c3,
+	BNXT_ULP_CLASS_HID_ec7b = 0xec7b,
+	BNXT_ULP_CLASS_HID_f8e3 = 0xf8e3,
+	BNXT_ULP_CLASS_HID_f227 = 0xf227,
+	BNXT_ULP_CLASS_HID_feaf = 0xfeaf,
+	BNXT_ULP_CLASS_HID_f6c7 = 0xf6c7,
+	BNXT_ULP_CLASS_HID_e34f = 0xe34f,
+	BNXT_ULP_CLASS_HID_fc83 = 0xfc83,
+	BNXT_ULP_CLASS_HID_e90b = 0xe90b,
+	BNXT_ULP_CLASS_HID_ef8f = 0xef8f,
+	BNXT_ULP_CLASS_HID_fc77 = 0xfc77,
+	BNXT_ULP_CLASS_HID_f64b = 0xf64b,
+	BNXT_ULP_CLASS_HID_e5e7 = 0xe5e7,
+	BNXT_ULP_CLASS_HID_fa6b = 0xfa6b,
+	BNXT_ULP_CLASS_HID_e6d3 = 0xe6d3,
+	BNXT_ULP_CLASS_HID_e017 = 0xe017,
+	BNXT_ULP_CLASS_HID_ec9f = 0xec9f,
+	BNXT_ULP_CLASS_HID_4e72f = 0x4e72f,
+	BNXT_ULP_CLASS_HID_4f397 = 0x4f397,
+	BNXT_ULP_CLASS_HID_4edeb = 0x4edeb,
+	BNXT_ULP_CLASS_HID_4fa53 = 0x4fa53,
+	BNXT_ULP_CLASS_HID_4f18b = 0x4f18b,
+	BNXT_ULP_CLASS_HID_4fe73 = 0x4fe73,
+	BNXT_ULP_CLASS_HID_4f7b7 = 0x4f7b7,
+	BNXT_ULP_CLASS_HID_4e43f = 0x4e43f,
+	BNXT_ULP_CLASS_HID_4eab3 = 0x4eab3,
+	BNXT_ULP_CLASS_HID_4f73b = 0x4f73b,
+	BNXT_ULP_CLASS_HID_4f17f = 0x4f17f,
+	BNXT_ULP_CLASS_HID_4e0ab = 0x4e0ab,
+	BNXT_ULP_CLASS_HID_4f51f = 0x4f51f,
+	BNXT_ULP_CLASS_HID_4e187 = 0x4e187,
+	BNXT_ULP_CLASS_HID_4fbdb = 0x4fbdb,
+	BNXT_ULP_CLASS_HID_4e843 = 0x4e843,
+	BNXT_ULP_CLASS_HID_1e27b = 0x1e27b,
+	BNXT_ULP_CLASS_HID_1eee3 = 0x1eee3,
+	BNXT_ULP_CLASS_HID_1e827 = 0x1e827,
+	BNXT_ULP_CLASS_HID_1f4af = 0x1f4af,
+	BNXT_ULP_CLASS_HID_1ecc7 = 0x1ecc7,
+	BNXT_ULP_CLASS_HID_1f94f = 0x1f94f,
+	BNXT_ULP_CLASS_HID_1f283 = 0x1f283,
+	BNXT_ULP_CLASS_HID_1ff0b = 0x1ff0b,
+	BNXT_ULP_CLASS_HID_1e8b3 = 0x1e8b3,
+	BNXT_ULP_CLASS_HID_1f53b = 0x1f53b,
+	BNXT_ULP_CLASS_HID_1ef7f = 0x1ef7f,
+	BNXT_ULP_CLASS_HID_1fbe7 = 0x1fbe7,
+	BNXT_ULP_CLASS_HID_1f06b = 0x1f06b,
+	BNXT_ULP_CLASS_HID_1fcd3 = 0x1fcd3,
+	BNXT_ULP_CLASS_HID_1f617 = 0x1f617,
+	BNXT_ULP_CLASS_HID_1e643 = 0x1e643,
+	BNXT_ULP_CLASS_HID_5fd2f = 0x5fd2f,
+	BNXT_ULP_CLASS_HID_5e997 = 0x5e997,
+	BNXT_ULP_CLASS_HID_5e3eb = 0x5e3eb,
+	BNXT_ULP_CLASS_HID_5f053 = 0x5f053,
+	BNXT_ULP_CLASS_HID_5e78b = 0x5e78b,
+	BNXT_ULP_CLASS_HID_5f473 = 0x5f473,
+	BNXT_ULP_CLASS_HID_5edb7 = 0x5edb7,
+	BNXT_ULP_CLASS_HID_5fa3f = 0x5fa3f,
+	BNXT_ULP_CLASS_HID_5e467 = 0x5e467,
+	BNXT_ULP_CLASS_HID_5f0ef = 0x5f0ef,
+	BNXT_ULP_CLASS_HID_5ea23 = 0x5ea23,
+	BNXT_ULP_CLASS_HID_5f6ab = 0x5f6ab,
+	BNXT_ULP_CLASS_HID_5eb1f = 0x5eb1f,
+	BNXT_ULP_CLASS_HID_5f787 = 0x5f787,
+	BNXT_ULP_CLASS_HID_5f1db = 0x5f1db,
+	BNXT_ULP_CLASS_HID_5e177 = 0x5e177,
+	BNXT_ULP_CLASS_HID_498d = 0x498d,
+	BNXT_ULP_CLASS_HID_4fc9 = 0x4fc9,
+	BNXT_ULP_CLASS_HID_0cf9 = 0x0cf9,
+	BNXT_ULP_CLASS_HID_1335 = 0x1335,
+	BNXT_ULP_CLASS_HID_232d = 0x232d,
+	BNXT_ULP_CLASS_HID_2969 = 0x2969,
+	BNXT_ULP_CLASS_HID_4345 = 0x4345,
+	BNXT_ULP_CLASS_HID_4981 = 0x4981,
+	BNXT_ULP_CLASS_HID_45809 = 0x45809,
+	BNXT_ULP_CLASS_HID_40179 = 0x40179,
+	BNXT_ULP_CLASS_HID_431a9 = 0x431a9,
+	BNXT_ULP_CLASS_HID_437d5 = 0x437d5,
+	BNXT_ULP_CLASS_HID_44e61 = 0x44e61,
+	BNXT_ULP_CLASS_HID_454ad = 0x454ad,
+	BNXT_ULP_CLASS_HID_42801 = 0x42801,
+	BNXT_ULP_CLASS_HID_42e4d = 0x42e4d,
+	BNXT_ULP_CLASS_HID_22c13 = 0x22c13,
+	BNXT_ULP_CLASS_HID_2322f = 0x2322f,
+	BNXT_ULP_CLASS_HID_2164f = 0x2164f,
+	BNXT_ULP_CLASS_HID_21c8b = 0x21c8b,
+	BNXT_ULP_CLASS_HID_24f87 = 0x24f87,
+	BNXT_ULP_CLASS_HID_255c3 = 0x255c3,
+	BNXT_ULP_CLASS_HID_239e3 = 0x239e3,
+	BNXT_ULP_CLASS_HID_2403f = 0x2403f,
+	BNXT_ULP_CLASS_HID_218c3 = 0x218c3,
+	BNXT_ULP_CLASS_HID_21f1f = 0x21f1f,
+	BNXT_ULP_CLASS_HID_2033f = 0x2033f,
+	BNXT_ULP_CLASS_HID_2097b = 0x2097b,
+	BNXT_ULP_CLASS_HID_23c77 = 0x23c77,
+	BNXT_ULP_CLASS_HID_242b3 = 0x242b3,
+	BNXT_ULP_CLASS_HID_226d3 = 0x226d3,
+	BNXT_ULP_CLASS_HID_22cef = 0x22cef,
+	BNXT_ULP_CLASS_HID_62727 = 0x62727,
+	BNXT_ULP_CLASS_HID_62d63 = 0x62d63,
+	BNXT_ULP_CLASS_HID_61183 = 0x61183,
+	BNXT_ULP_CLASS_HID_617df = 0x617df,
+	BNXT_ULP_CLASS_HID_64adb = 0x64adb,
+	BNXT_ULP_CLASS_HID_65117 = 0x65117,
+	BNXT_ULP_CLASS_HID_63537 = 0x63537,
+	BNXT_ULP_CLASS_HID_63b73 = 0x63b73,
+	BNXT_ULP_CLASS_HID_61417 = 0x61417,
+	BNXT_ULP_CLASS_HID_61a53 = 0x61a53,
+	BNXT_ULP_CLASS_HID_65b3f = 0x65b3f,
+	BNXT_ULP_CLASS_HID_6048f = 0x6048f,
+	BNXT_ULP_CLASS_HID_6378b = 0x6378b,
+	BNXT_ULP_CLASS_HID_63dc7 = 0x63dc7,
+	BNXT_ULP_CLASS_HID_621e7 = 0x621e7,
+	BNXT_ULP_CLASS_HID_62823 = 0x62823,
+	BNXT_ULP_CLASS_HID_8b0b = 0x8b0b,
+	BNXT_ULP_CLASS_HID_9137 = 0x9137,
+	BNXT_ULP_CLASS_HID_d223 = 0xd223,
+	BNXT_ULP_CLASS_HID_d86f = 0xd86f,
+	BNXT_ULP_CLASS_HID_ae9f = 0xae9f,
+	BNXT_ULP_CLASS_HID_b4db = 0xb4db,
+	BNXT_ULP_CLASS_HID_98fb = 0x98fb,
+	BNXT_ULP_CLASS_HID_9f27 = 0x9f27,
+	BNXT_ULP_CLASS_HID_4863f = 0x4863f,
+	BNXT_ULP_CLASS_HID_48c7b = 0x48c7b,
+	BNXT_ULP_CLASS_HID_4cd57 = 0x4cd57,
+	BNXT_ULP_CLASS_HID_4d393 = 0x4d393,
+	BNXT_ULP_CLASS_HID_4a9c3 = 0x4a9c3,
+	BNXT_ULP_CLASS_HID_4b00f = 0x4b00f,
+	BNXT_ULP_CLASS_HID_4942f = 0x4942f,
+	BNXT_ULP_CLASS_HID_49a6b = 0x49a6b,
+	BNXT_ULP_CLASS_HID_1a10b = 0x1a10b,
+	BNXT_ULP_CLASS_HID_1a737 = 0x1a737,
+	BNXT_ULP_CLASS_HID_18b57 = 0x18b57,
+	BNXT_ULP_CLASS_HID_19193 = 0x19193,
+	BNXT_ULP_CLASS_HID_1c49f = 0x1c49f,
+	BNXT_ULP_CLASS_HID_1cadb = 0x1cadb,
+	BNXT_ULP_CLASS_HID_1aefb = 0x1aefb,
+	BNXT_ULP_CLASS_HID_1b527 = 0x1b527,
+	BNXT_ULP_CLASS_HID_59c3f = 0x59c3f,
+	BNXT_ULP_CLASS_HID_5a27b = 0x5a27b,
+	BNXT_ULP_CLASS_HID_5869b = 0x5869b,
+	BNXT_ULP_CLASS_HID_58cc7 = 0x58cc7,
+	BNXT_ULP_CLASS_HID_5bfc3 = 0x5bfc3,
+	BNXT_ULP_CLASS_HID_5c60f = 0x5c60f,
+	BNXT_ULP_CLASS_HID_5aa2f = 0x5aa2f,
+	BNXT_ULP_CLASS_HID_5b06b = 0x5b06b,
+	BNXT_ULP_CLASS_HID_49ad = 0x49ad,
+	BNXT_ULP_CLASS_HID_4fe9 = 0x4fe9,
+	BNXT_ULP_CLASS_HID_0cd9 = 0x0cd9,
+	BNXT_ULP_CLASS_HID_1315 = 0x1315,
+	BNXT_ULP_CLASS_HID_230d = 0x230d,
+	BNXT_ULP_CLASS_HID_2949 = 0x2949,
+	BNXT_ULP_CLASS_HID_4365 = 0x4365,
+	BNXT_ULP_CLASS_HID_49a1 = 0x49a1,
+	BNXT_ULP_CLASS_HID_4035 = 0x4035,
+	BNXT_ULP_CLASS_HID_4671 = 0x4671,
+	BNXT_ULP_CLASS_HID_0361 = 0x0361,
+	BNXT_ULP_CLASS_HID_09bd = 0x09bd,
+	BNXT_ULP_CLASS_HID_1995 = 0x1995,
+	BNXT_ULP_CLASS_HID_1fd1 = 0x1fd1,
+	BNXT_ULP_CLASS_HID_398d = 0x398d,
+	BNXT_ULP_CLASS_HID_3fc9 = 0x3fc9,
+	BNXT_ULP_CLASS_HID_444e1 = 0x444e1,
+	BNXT_ULP_CLASS_HID_44b3d = 0x44b3d,
+	BNXT_ULP_CLASS_HID_4082d = 0x4082d,
+	BNXT_ULP_CLASS_HID_40e69 = 0x40e69,
+	BNXT_ULP_CLASS_HID_41e41 = 0x41e41,
+	BNXT_ULP_CLASS_HID_4249d = 0x4249d,
+	BNXT_ULP_CLASS_HID_43eb9 = 0x43eb9,
+	BNXT_ULP_CLASS_HID_444f5 = 0x444f5,
+	BNXT_ULP_CLASS_HID_43b09 = 0x43b09,
+	BNXT_ULP_CLASS_HID_44145 = 0x44145,
+	BNXT_ULP_CLASS_HID_45b61 = 0x45b61,
+	BNXT_ULP_CLASS_HID_404f1 = 0x404f1,
+	BNXT_ULP_CLASS_HID_414e9 = 0x414e9,
+	BNXT_ULP_CLASS_HID_41b25 = 0x41b25,
+	BNXT_ULP_CLASS_HID_434c1 = 0x434c1,
+	BNXT_ULP_CLASS_HID_43b1d = 0x43b1d,
+	BNXT_ULP_CLASS_HID_45829 = 0x45829,
+	BNXT_ULP_CLASS_HID_40159 = 0x40159,
+	BNXT_ULP_CLASS_HID_43189 = 0x43189,
+	BNXT_ULP_CLASS_HID_437f5 = 0x437f5,
+	BNXT_ULP_CLASS_HID_44e41 = 0x44e41,
+	BNXT_ULP_CLASS_HID_4548d = 0x4548d,
+	BNXT_ULP_CLASS_HID_42821 = 0x42821,
+	BNXT_ULP_CLASS_HID_42e6d = 0x42e6d,
+	BNXT_ULP_CLASS_HID_6271d = 0x6271d,
+	BNXT_ULP_CLASS_HID_62d59 = 0x62d59,
+	BNXT_ULP_CLASS_HID_600fd = 0x600fd,
+	BNXT_ULP_CLASS_HID_60739 = 0x60739,
+	BNXT_ULP_CLASS_HID_61db5 = 0x61db5,
+	BNXT_ULP_CLASS_HID_623f1 = 0x623f1,
+	BNXT_ULP_CLASS_HID_65421 = 0x65421,
+	BNXT_ULP_CLASS_HID_65a6d = 0x65a6d,
+	BNXT_ULP_CLASS_HID_5111d = 0x5111d,
+	BNXT_ULP_CLASS_HID_51759 = 0x51759,
+	BNXT_ULP_CLASS_HID_54789 = 0x54789,
+	BNXT_ULP_CLASS_HID_54df5 = 0x54df5,
+	BNXT_ULP_CLASS_HID_507b5 = 0x507b5,
+	BNXT_ULP_CLASS_HID_50df1 = 0x50df1,
+	BNXT_ULP_CLASS_HID_53e21 = 0x53e21,
+	BNXT_ULP_CLASS_HID_5446d = 0x5446d,
+	BNXT_ULP_CLASS_HID_73d1d = 0x73d1d,
+	BNXT_ULP_CLASS_HID_74359 = 0x74359,
+	BNXT_ULP_CLASS_HID_716fd = 0x716fd,
+	BNXT_ULP_CLASS_HID_71d39 = 0x71d39,
+	BNXT_ULP_CLASS_HID_733b5 = 0x733b5,
+	BNXT_ULP_CLASS_HID_739f1 = 0x739f1,
+	BNXT_ULP_CLASS_HID_70d15 = 0x70d15,
+	BNXT_ULP_CLASS_HID_71351 = 0x71351,
+	BNXT_ULP_CLASS_HID_49cd = 0x49cd,
+	BNXT_ULP_CLASS_HID_4f89 = 0x4f89,
+	BNXT_ULP_CLASS_HID_0cb9 = 0x0cb9,
+	BNXT_ULP_CLASS_HID_1375 = 0x1375,
+	BNXT_ULP_CLASS_HID_236d = 0x236d,
+	BNXT_ULP_CLASS_HID_2929 = 0x2929,
+	BNXT_ULP_CLASS_HID_4305 = 0x4305,
+	BNXT_ULP_CLASS_HID_49c1 = 0x49c1,
+	BNXT_ULP_CLASS_HID_4055 = 0x4055,
+	BNXT_ULP_CLASS_HID_4611 = 0x4611,
+	BNXT_ULP_CLASS_HID_0301 = 0x0301,
+	BNXT_ULP_CLASS_HID_09dd = 0x09dd,
+	BNXT_ULP_CLASS_HID_19f5 = 0x19f5,
+	BNXT_ULP_CLASS_HID_1fb1 = 0x1fb1,
+	BNXT_ULP_CLASS_HID_39ed = 0x39ed,
+	BNXT_ULP_CLASS_HID_3fa9 = 0x3fa9,
+	BNXT_ULP_CLASS_HID_44481 = 0x44481,
+	BNXT_ULP_CLASS_HID_44b5d = 0x44b5d,
+	BNXT_ULP_CLASS_HID_4084d = 0x4084d,
+	BNXT_ULP_CLASS_HID_40e09 = 0x40e09,
+	BNXT_ULP_CLASS_HID_41e21 = 0x41e21,
+	BNXT_ULP_CLASS_HID_424fd = 0x424fd,
+	BNXT_ULP_CLASS_HID_43ed9 = 0x43ed9,
+	BNXT_ULP_CLASS_HID_44495 = 0x44495,
+	BNXT_ULP_CLASS_HID_43b69 = 0x43b69,
+	BNXT_ULP_CLASS_HID_44125 = 0x44125,
+	BNXT_ULP_CLASS_HID_45b01 = 0x45b01,
+	BNXT_ULP_CLASS_HID_40491 = 0x40491,
+	BNXT_ULP_CLASS_HID_41489 = 0x41489,
+	BNXT_ULP_CLASS_HID_41b45 = 0x41b45,
+	BNXT_ULP_CLASS_HID_434a1 = 0x434a1,
+	BNXT_ULP_CLASS_HID_43b7d = 0x43b7d,
+	BNXT_ULP_CLASS_HID_45849 = 0x45849,
+	BNXT_ULP_CLASS_HID_40139 = 0x40139,
+	BNXT_ULP_CLASS_HID_431e9 = 0x431e9,
+	BNXT_ULP_CLASS_HID_43795 = 0x43795,
+	BNXT_ULP_CLASS_HID_44e21 = 0x44e21,
+	BNXT_ULP_CLASS_HID_454ed = 0x454ed,
+	BNXT_ULP_CLASS_HID_42841 = 0x42841,
+	BNXT_ULP_CLASS_HID_42e0d = 0x42e0d,
+	BNXT_ULP_CLASS_HID_6277d = 0x6277d,
+	BNXT_ULP_CLASS_HID_62d39 = 0x62d39,
+	BNXT_ULP_CLASS_HID_6009d = 0x6009d,
+	BNXT_ULP_CLASS_HID_60759 = 0x60759,
+	BNXT_ULP_CLASS_HID_61dd5 = 0x61dd5,
+	BNXT_ULP_CLASS_HID_62391 = 0x62391,
+	BNXT_ULP_CLASS_HID_65441 = 0x65441,
+	BNXT_ULP_CLASS_HID_65a0d = 0x65a0d,
+	BNXT_ULP_CLASS_HID_5117d = 0x5117d,
+	BNXT_ULP_CLASS_HID_51739 = 0x51739,
+	BNXT_ULP_CLASS_HID_547e9 = 0x547e9,
+	BNXT_ULP_CLASS_HID_54d95 = 0x54d95,
+	BNXT_ULP_CLASS_HID_507d5 = 0x507d5,
+	BNXT_ULP_CLASS_HID_50d91 = 0x50d91,
+	BNXT_ULP_CLASS_HID_53e41 = 0x53e41,
+	BNXT_ULP_CLASS_HID_5440d = 0x5440d,
+	BNXT_ULP_CLASS_HID_73d7d = 0x73d7d,
+	BNXT_ULP_CLASS_HID_74339 = 0x74339,
+	BNXT_ULP_CLASS_HID_7169d = 0x7169d,
+	BNXT_ULP_CLASS_HID_71d59 = 0x71d59,
+	BNXT_ULP_CLASS_HID_733d5 = 0x733d5,
+	BNXT_ULP_CLASS_HID_73991 = 0x73991,
+	BNXT_ULP_CLASS_HID_70d75 = 0x70d75,
+	BNXT_ULP_CLASS_HID_71331 = 0x71331,
+	BNXT_ULP_CLASS_HID_22c33 = 0x22c33,
+	BNXT_ULP_CLASS_HID_2320f = 0x2320f,
+	BNXT_ULP_CLASS_HID_2166f = 0x2166f,
+	BNXT_ULP_CLASS_HID_21cab = 0x21cab,
+	BNXT_ULP_CLASS_HID_24fa7 = 0x24fa7,
+	BNXT_ULP_CLASS_HID_255e3 = 0x255e3,
+	BNXT_ULP_CLASS_HID_239c3 = 0x239c3,
+	BNXT_ULP_CLASS_HID_2401f = 0x2401f,
+	BNXT_ULP_CLASS_HID_218e3 = 0x218e3,
+	BNXT_ULP_CLASS_HID_21f3f = 0x21f3f,
+	BNXT_ULP_CLASS_HID_2031f = 0x2031f,
+	BNXT_ULP_CLASS_HID_2095b = 0x2095b,
+	BNXT_ULP_CLASS_HID_23c57 = 0x23c57,
+	BNXT_ULP_CLASS_HID_24293 = 0x24293,
+	BNXT_ULP_CLASS_HID_226f3 = 0x226f3,
+	BNXT_ULP_CLASS_HID_22ccf = 0x22ccf,
+	BNXT_ULP_CLASS_HID_62707 = 0x62707,
+	BNXT_ULP_CLASS_HID_62d43 = 0x62d43,
+	BNXT_ULP_CLASS_HID_611a3 = 0x611a3,
+	BNXT_ULP_CLASS_HID_617ff = 0x617ff,
+	BNXT_ULP_CLASS_HID_64afb = 0x64afb,
+	BNXT_ULP_CLASS_HID_65137 = 0x65137,
+	BNXT_ULP_CLASS_HID_63517 = 0x63517,
+	BNXT_ULP_CLASS_HID_63b53 = 0x63b53,
+	BNXT_ULP_CLASS_HID_61437 = 0x61437,
+	BNXT_ULP_CLASS_HID_61a73 = 0x61a73,
+	BNXT_ULP_CLASS_HID_65b1f = 0x65b1f,
+	BNXT_ULP_CLASS_HID_604af = 0x604af,
+	BNXT_ULP_CLASS_HID_637ab = 0x637ab,
+	BNXT_ULP_CLASS_HID_63de7 = 0x63de7,
+	BNXT_ULP_CLASS_HID_621c7 = 0x621c7,
+	BNXT_ULP_CLASS_HID_62803 = 0x62803,
+	BNXT_ULP_CLASS_HID_34233 = 0x34233,
+	BNXT_ULP_CLASS_HID_3480f = 0x3480f,
+	BNXT_ULP_CLASS_HID_32c6f = 0x32c6f,
+	BNXT_ULP_CLASS_HID_332ab = 0x332ab,
+	BNXT_ULP_CLASS_HID_308fb = 0x308fb,
+	BNXT_ULP_CLASS_HID_30f37 = 0x30f37,
+	BNXT_ULP_CLASS_HID_34fc3 = 0x34fc3,
+	BNXT_ULP_CLASS_HID_3561f = 0x3561f,
+	BNXT_ULP_CLASS_HID_32ee3 = 0x32ee3,
+	BNXT_ULP_CLASS_HID_3353f = 0x3353f,
+	BNXT_ULP_CLASS_HID_3191f = 0x3191f,
+	BNXT_ULP_CLASS_HID_31f5b = 0x31f5b,
+	BNXT_ULP_CLASS_HID_35257 = 0x35257,
+	BNXT_ULP_CLASS_HID_35893 = 0x35893,
+	BNXT_ULP_CLASS_HID_33cf3 = 0x33cf3,
+	BNXT_ULP_CLASS_HID_342cf = 0x342cf,
+	BNXT_ULP_CLASS_HID_73d07 = 0x73d07,
+	BNXT_ULP_CLASS_HID_74343 = 0x74343,
+	BNXT_ULP_CLASS_HID_727a3 = 0x727a3,
+	BNXT_ULP_CLASS_HID_72dff = 0x72dff,
+	BNXT_ULP_CLASS_HID_703cf = 0x703cf,
+	BNXT_ULP_CLASS_HID_70a0b = 0x70a0b,
+	BNXT_ULP_CLASS_HID_74b17 = 0x74b17,
+	BNXT_ULP_CLASS_HID_75153 = 0x75153,
+	BNXT_ULP_CLASS_HID_72a37 = 0x72a37,
+	BNXT_ULP_CLASS_HID_73073 = 0x73073,
+	BNXT_ULP_CLASS_HID_71453 = 0x71453,
+	BNXT_ULP_CLASS_HID_71aaf = 0x71aaf,
+	BNXT_ULP_CLASS_HID_74dab = 0x74dab,
+	BNXT_ULP_CLASS_HID_753e7 = 0x753e7,
+	BNXT_ULP_CLASS_HID_737c7 = 0x737c7,
+	BNXT_ULP_CLASS_HID_73e03 = 0x73e03,
+	BNXT_ULP_CLASS_HID_2b733 = 0x2b733,
+	BNXT_ULP_CLASS_HID_2bd0f = 0x2bd0f,
+	BNXT_ULP_CLASS_HID_2a16f = 0x2a16f,
+	BNXT_ULP_CLASS_HID_2a7ab = 0x2a7ab,
+	BNXT_ULP_CLASS_HID_2daa7 = 0x2daa7,
+	BNXT_ULP_CLASS_HID_28437 = 0x28437,
+	BNXT_ULP_CLASS_HID_2c4c3 = 0x2c4c3,
+	BNXT_ULP_CLASS_HID_2cb1f = 0x2cb1f,
+	BNXT_ULP_CLASS_HID_2a3e3 = 0x2a3e3,
+	BNXT_ULP_CLASS_HID_2aa3f = 0x2aa3f,
+	BNXT_ULP_CLASS_HID_28e1f = 0x28e1f,
+	BNXT_ULP_CLASS_HID_2945b = 0x2945b,
+	BNXT_ULP_CLASS_HID_2c757 = 0x2c757,
+	BNXT_ULP_CLASS_HID_2cd93 = 0x2cd93,
+	BNXT_ULP_CLASS_HID_2b1f3 = 0x2b1f3,
+	BNXT_ULP_CLASS_HID_2b7cf = 0x2b7cf,
+	BNXT_ULP_CLASS_HID_6b207 = 0x6b207,
+	BNXT_ULP_CLASS_HID_6b843 = 0x6b843,
+	BNXT_ULP_CLASS_HID_69ca3 = 0x69ca3,
+	BNXT_ULP_CLASS_HID_6a2ff = 0x6a2ff,
+	BNXT_ULP_CLASS_HID_6d5fb = 0x6d5fb,
+	BNXT_ULP_CLASS_HID_6dc37 = 0x6dc37,
+	BNXT_ULP_CLASS_HID_6c017 = 0x6c017,
+	BNXT_ULP_CLASS_HID_6c653 = 0x6c653,
+	BNXT_ULP_CLASS_HID_69f37 = 0x69f37,
+	BNXT_ULP_CLASS_HID_6a573 = 0x6a573,
+	BNXT_ULP_CLASS_HID_68953 = 0x68953,
+	BNXT_ULP_CLASS_HID_68faf = 0x68faf,
+	BNXT_ULP_CLASS_HID_6c2ab = 0x6c2ab,
+	BNXT_ULP_CLASS_HID_6c8e7 = 0x6c8e7,
+	BNXT_ULP_CLASS_HID_6acc7 = 0x6acc7,
+	BNXT_ULP_CLASS_HID_6b303 = 0x6b303,
+	BNXT_ULP_CLASS_HID_3cd33 = 0x3cd33,
+	BNXT_ULP_CLASS_HID_3d30f = 0x3d30f,
+	BNXT_ULP_CLASS_HID_3b76f = 0x3b76f,
+	BNXT_ULP_CLASS_HID_3bdab = 0x3bdab,
+	BNXT_ULP_CLASS_HID_393fb = 0x393fb,
+	BNXT_ULP_CLASS_HID_39a37 = 0x39a37,
+	BNXT_ULP_CLASS_HID_3dac3 = 0x3dac3,
+	BNXT_ULP_CLASS_HID_38453 = 0x38453,
+	BNXT_ULP_CLASS_HID_3b9e3 = 0x3b9e3,
+	BNXT_ULP_CLASS_HID_3c03f = 0x3c03f,
+	BNXT_ULP_CLASS_HID_3a41f = 0x3a41f,
+	BNXT_ULP_CLASS_HID_3aa5b = 0x3aa5b,
+	BNXT_ULP_CLASS_HID_380ab = 0x380ab,
+	BNXT_ULP_CLASS_HID_386e7 = 0x386e7,
+	BNXT_ULP_CLASS_HID_3c7f3 = 0x3c7f3,
+	BNXT_ULP_CLASS_HID_3cdcf = 0x3cdcf,
+	BNXT_ULP_CLASS_HID_7c807 = 0x7c807,
+	BNXT_ULP_CLASS_HID_7ce43 = 0x7ce43,
+	BNXT_ULP_CLASS_HID_7b2a3 = 0x7b2a3,
+	BNXT_ULP_CLASS_HID_7b8ff = 0x7b8ff,
+	BNXT_ULP_CLASS_HID_78ecf = 0x78ecf,
+	BNXT_ULP_CLASS_HID_7950b = 0x7950b,
+	BNXT_ULP_CLASS_HID_7d617 = 0x7d617,
+	BNXT_ULP_CLASS_HID_7dc53 = 0x7dc53,
+	BNXT_ULP_CLASS_HID_7b537 = 0x7b537,
+	BNXT_ULP_CLASS_HID_7bb73 = 0x7bb73,
+	BNXT_ULP_CLASS_HID_79f53 = 0x79f53,
+	BNXT_ULP_CLASS_HID_7a5af = 0x7a5af,
+	BNXT_ULP_CLASS_HID_7d8ab = 0x7d8ab,
+	BNXT_ULP_CLASS_HID_7823b = 0x7823b,
+	BNXT_ULP_CLASS_HID_7c2c7 = 0x7c2c7,
+	BNXT_ULP_CLASS_HID_7c903 = 0x7c903,
+	BNXT_ULP_CLASS_HID_8b2b = 0x8b2b,
+	BNXT_ULP_CLASS_HID_9117 = 0x9117,
+	BNXT_ULP_CLASS_HID_d203 = 0xd203,
+	BNXT_ULP_CLASS_HID_d84f = 0xd84f,
+	BNXT_ULP_CLASS_HID_aebf = 0xaebf,
+	BNXT_ULP_CLASS_HID_b4fb = 0xb4fb,
+	BNXT_ULP_CLASS_HID_98db = 0x98db,
+	BNXT_ULP_CLASS_HID_9f07 = 0x9f07,
+	BNXT_ULP_CLASS_HID_4861f = 0x4861f,
+	BNXT_ULP_CLASS_HID_48c5b = 0x48c5b,
+	BNXT_ULP_CLASS_HID_4cd77 = 0x4cd77,
+	BNXT_ULP_CLASS_HID_4d3b3 = 0x4d3b3,
+	BNXT_ULP_CLASS_HID_4a9e3 = 0x4a9e3,
+	BNXT_ULP_CLASS_HID_4b02f = 0x4b02f,
+	BNXT_ULP_CLASS_HID_4940f = 0x4940f,
+	BNXT_ULP_CLASS_HID_49a4b = 0x49a4b,
+	BNXT_ULP_CLASS_HID_1a12b = 0x1a12b,
+	BNXT_ULP_CLASS_HID_1a717 = 0x1a717,
+	BNXT_ULP_CLASS_HID_18b77 = 0x18b77,
+	BNXT_ULP_CLASS_HID_191b3 = 0x191b3,
+	BNXT_ULP_CLASS_HID_1c4bf = 0x1c4bf,
+	BNXT_ULP_CLASS_HID_1cafb = 0x1cafb,
+	BNXT_ULP_CLASS_HID_1aedb = 0x1aedb,
+	BNXT_ULP_CLASS_HID_1b507 = 0x1b507,
+	BNXT_ULP_CLASS_HID_59c1f = 0x59c1f,
+	BNXT_ULP_CLASS_HID_5a25b = 0x5a25b,
+	BNXT_ULP_CLASS_HID_586bb = 0x586bb,
+	BNXT_ULP_CLASS_HID_58ce7 = 0x58ce7,
+	BNXT_ULP_CLASS_HID_5bfe3 = 0x5bfe3,
+	BNXT_ULP_CLASS_HID_5c62f = 0x5c62f,
+	BNXT_ULP_CLASS_HID_5aa0f = 0x5aa0f,
+	BNXT_ULP_CLASS_HID_5b04b = 0x5b04b,
+	BNXT_ULP_CLASS_HID_d0ab = 0xd0ab,
+	BNXT_ULP_CLASS_HID_d697 = 0xd697,
+	BNXT_ULP_CLASS_HID_d783 = 0xd783,
+	BNXT_ULP_CLASS_HID_c133 = 0xc133,
+	BNXT_ULP_CLASS_HID_f43f = 0xf43f,
+	BNXT_ULP_CLASS_HID_fa7b = 0xfa7b,
+	BNXT_ULP_CLASS_HID_de5b = 0xde5b,
+	BNXT_ULP_CLASS_HID_e487 = 0xe487,
+	BNXT_ULP_CLASS_HID_4cb9f = 0x4cb9f,
+	BNXT_ULP_CLASS_HID_4d1db = 0x4d1db,
+	BNXT_ULP_CLASS_HID_4d2f7 = 0x4d2f7,
+	BNXT_ULP_CLASS_HID_4d933 = 0x4d933,
+	BNXT_ULP_CLASS_HID_4ef63 = 0x4ef63,
+	BNXT_ULP_CLASS_HID_4f5af = 0x4f5af,
+	BNXT_ULP_CLASS_HID_4d98f = 0x4d98f,
+	BNXT_ULP_CLASS_HID_4dfcb = 0x4dfcb,
+	BNXT_ULP_CLASS_HID_1e6ab = 0x1e6ab,
+	BNXT_ULP_CLASS_HID_1ec97 = 0x1ec97,
+	BNXT_ULP_CLASS_HID_1d0f7 = 0x1d0f7,
+	BNXT_ULP_CLASS_HID_1d733 = 0x1d733,
+	BNXT_ULP_CLASS_HID_1ca3f = 0x1ca3f,
+	BNXT_ULP_CLASS_HID_1d07b = 0x1d07b,
+	BNXT_ULP_CLASS_HID_1f45b = 0x1f45b,
+	BNXT_ULP_CLASS_HID_1fa87 = 0x1fa87,
+	BNXT_ULP_CLASS_HID_5e19f = 0x5e19f,
+	BNXT_ULP_CLASS_HID_5e7db = 0x5e7db,
+	BNXT_ULP_CLASS_HID_5cc3b = 0x5cc3b,
+	BNXT_ULP_CLASS_HID_5d267 = 0x5d267,
+	BNXT_ULP_CLASS_HID_5c563 = 0x5c563,
+	BNXT_ULP_CLASS_HID_5cbaf = 0x5cbaf,
+	BNXT_ULP_CLASS_HID_5ef8f = 0x5ef8f,
+	BNXT_ULP_CLASS_HID_5f5cb = 0x5f5cb,
+	BNXT_ULP_CLASS_HID_adeb = 0xadeb,
+	BNXT_ULP_CLASS_HID_b3d7 = 0xb3d7,
+	BNXT_ULP_CLASS_HID_f4c3 = 0xf4c3,
+	BNXT_ULP_CLASS_HID_fb0f = 0xfb0f,
+	BNXT_ULP_CLASS_HID_b17f = 0xb17f,
+	BNXT_ULP_CLASS_HID_b7bb = 0xb7bb,
+	BNXT_ULP_CLASS_HID_bb9b = 0xbb9b,
+	BNXT_ULP_CLASS_HID_a1c7 = 0xa1c7,
+	BNXT_ULP_CLASS_HID_4a8df = 0x4a8df,
+	BNXT_ULP_CLASS_HID_4af1b = 0x4af1b,
+	BNXT_ULP_CLASS_HID_4f037 = 0x4f037,
+	BNXT_ULP_CLASS_HID_4f673 = 0x4f673,
+	BNXT_ULP_CLASS_HID_4aca3 = 0x4aca3,
+	BNXT_ULP_CLASS_HID_4b2ef = 0x4b2ef,
+	BNXT_ULP_CLASS_HID_4b6cf = 0x4b6cf,
+	BNXT_ULP_CLASS_HID_4bd0b = 0x4bd0b,
+	BNXT_ULP_CLASS_HID_1a3eb = 0x1a3eb,
+	BNXT_ULP_CLASS_HID_1a9d7 = 0x1a9d7,
+	BNXT_ULP_CLASS_HID_1ae37 = 0x1ae37,
+	BNXT_ULP_CLASS_HID_1b473 = 0x1b473,
+	BNXT_ULP_CLASS_HID_1e77f = 0x1e77f,
+	BNXT_ULP_CLASS_HID_1edbb = 0x1edbb,
+	BNXT_ULP_CLASS_HID_1b19b = 0x1b19b,
+	BNXT_ULP_CLASS_HID_1b7c7 = 0x1b7c7,
+	BNXT_ULP_CLASS_HID_5bedf = 0x5bedf,
+	BNXT_ULP_CLASS_HID_5a51b = 0x5a51b,
+	BNXT_ULP_CLASS_HID_5a97b = 0x5a97b,
+	BNXT_ULP_CLASS_HID_5afa7 = 0x5afa7,
+	BNXT_ULP_CLASS_HID_5e2a3 = 0x5e2a3,
+	BNXT_ULP_CLASS_HID_5e8ef = 0x5e8ef,
+	BNXT_ULP_CLASS_HID_5accf = 0x5accf,
+	BNXT_ULP_CLASS_HID_5b30b = 0x5b30b,
+	BNXT_ULP_CLASS_HID_f36b = 0xf36b,
+	BNXT_ULP_CLASS_HID_f957 = 0xf957,
+	BNXT_ULP_CLASS_HID_fa43 = 0xfa43,
+	BNXT_ULP_CLASS_HID_e3f3 = 0xe3f3,
+	BNXT_ULP_CLASS_HID_f6ff = 0xf6ff,
+	BNXT_ULP_CLASS_HID_fd3b = 0xfd3b,
+	BNXT_ULP_CLASS_HID_e11b = 0xe11b,
+	BNXT_ULP_CLASS_HID_e747 = 0xe747,
+	BNXT_ULP_CLASS_HID_4ee5f = 0x4ee5f,
+	BNXT_ULP_CLASS_HID_4f49b = 0x4f49b,
+	BNXT_ULP_CLASS_HID_4f5b7 = 0x4f5b7,
+	BNXT_ULP_CLASS_HID_4fbf3 = 0x4fbf3,
+	BNXT_ULP_CLASS_HID_4f223 = 0x4f223,
+	BNXT_ULP_CLASS_HID_4f86f = 0x4f86f,
+	BNXT_ULP_CLASS_HID_4fc4f = 0x4fc4f,
+	BNXT_ULP_CLASS_HID_4e28b = 0x4e28b,
+	BNXT_ULP_CLASS_HID_1e96b = 0x1e96b,
+	BNXT_ULP_CLASS_HID_1ef57 = 0x1ef57,
+	BNXT_ULP_CLASS_HID_1f3b7 = 0x1f3b7,
+	BNXT_ULP_CLASS_HID_1f9f3 = 0x1f9f3,
+	BNXT_ULP_CLASS_HID_1ecff = 0x1ecff,
+	BNXT_ULP_CLASS_HID_1f33b = 0x1f33b,
+	BNXT_ULP_CLASS_HID_1f71b = 0x1f71b,
+	BNXT_ULP_CLASS_HID_1fd47 = 0x1fd47,
+	BNXT_ULP_CLASS_HID_5e45f = 0x5e45f,
+	BNXT_ULP_CLASS_HID_5ea9b = 0x5ea9b,
+	BNXT_ULP_CLASS_HID_5eefb = 0x5eefb,
+	BNXT_ULP_CLASS_HID_5f527 = 0x5f527,
+	BNXT_ULP_CLASS_HID_5e823 = 0x5e823,
+	BNXT_ULP_CLASS_HID_5ee6f = 0x5ee6f,
+	BNXT_ULP_CLASS_HID_5f24f = 0x5f24f,
+	BNXT_ULP_CLASS_HID_5f88b = 0x5f88b,
+	BNXT_ULP_CLASS_HID_22c53 = 0x22c53,
+	BNXT_ULP_CLASS_HID_2326f = 0x2326f,
+	BNXT_ULP_CLASS_HID_2160f = 0x2160f,
+	BNXT_ULP_CLASS_HID_21ccb = 0x21ccb,
+	BNXT_ULP_CLASS_HID_24fc7 = 0x24fc7,
+	BNXT_ULP_CLASS_HID_25583 = 0x25583,
+	BNXT_ULP_CLASS_HID_239a3 = 0x239a3,
+	BNXT_ULP_CLASS_HID_2407f = 0x2407f,
+	BNXT_ULP_CLASS_HID_21883 = 0x21883,
+	BNXT_ULP_CLASS_HID_21f5f = 0x21f5f,
+	BNXT_ULP_CLASS_HID_2037f = 0x2037f,
+	BNXT_ULP_CLASS_HID_2093b = 0x2093b,
+	BNXT_ULP_CLASS_HID_23c37 = 0x23c37,
+	BNXT_ULP_CLASS_HID_242f3 = 0x242f3,
+	BNXT_ULP_CLASS_HID_22693 = 0x22693,
+	BNXT_ULP_CLASS_HID_22caf = 0x22caf,
+	BNXT_ULP_CLASS_HID_62767 = 0x62767,
+	BNXT_ULP_CLASS_HID_62d23 = 0x62d23,
+	BNXT_ULP_CLASS_HID_611c3 = 0x611c3,
+	BNXT_ULP_CLASS_HID_6179f = 0x6179f,
+	BNXT_ULP_CLASS_HID_64a9b = 0x64a9b,
+	BNXT_ULP_CLASS_HID_65157 = 0x65157,
+	BNXT_ULP_CLASS_HID_63577 = 0x63577,
+	BNXT_ULP_CLASS_HID_63b33 = 0x63b33,
+	BNXT_ULP_CLASS_HID_61457 = 0x61457,
+	BNXT_ULP_CLASS_HID_61a13 = 0x61a13,
+	BNXT_ULP_CLASS_HID_65b7f = 0x65b7f,
+	BNXT_ULP_CLASS_HID_604cf = 0x604cf,
+	BNXT_ULP_CLASS_HID_637cb = 0x637cb,
+	BNXT_ULP_CLASS_HID_63d87 = 0x63d87,
+	BNXT_ULP_CLASS_HID_621a7 = 0x621a7,
+	BNXT_ULP_CLASS_HID_62863 = 0x62863,
+	BNXT_ULP_CLASS_HID_34253 = 0x34253,
+	BNXT_ULP_CLASS_HID_3486f = 0x3486f,
+	BNXT_ULP_CLASS_HID_32c0f = 0x32c0f,
+	BNXT_ULP_CLASS_HID_332cb = 0x332cb,
+	BNXT_ULP_CLASS_HID_3089b = 0x3089b,
+	BNXT_ULP_CLASS_HID_30f57 = 0x30f57,
+	BNXT_ULP_CLASS_HID_34fa3 = 0x34fa3,
+	BNXT_ULP_CLASS_HID_3567f = 0x3567f,
+	BNXT_ULP_CLASS_HID_32e83 = 0x32e83,
+	BNXT_ULP_CLASS_HID_3355f = 0x3355f,
+	BNXT_ULP_CLASS_HID_3197f = 0x3197f,
+	BNXT_ULP_CLASS_HID_31f3b = 0x31f3b,
+	BNXT_ULP_CLASS_HID_35237 = 0x35237,
+	BNXT_ULP_CLASS_HID_358f3 = 0x358f3,
+	BNXT_ULP_CLASS_HID_33c93 = 0x33c93,
+	BNXT_ULP_CLASS_HID_342af = 0x342af,
+	BNXT_ULP_CLASS_HID_73d67 = 0x73d67,
+	BNXT_ULP_CLASS_HID_74323 = 0x74323,
+	BNXT_ULP_CLASS_HID_727c3 = 0x727c3,
+	BNXT_ULP_CLASS_HID_72d9f = 0x72d9f,
+	BNXT_ULP_CLASS_HID_703af = 0x703af,
+	BNXT_ULP_CLASS_HID_70a6b = 0x70a6b,
+	BNXT_ULP_CLASS_HID_74b77 = 0x74b77,
+	BNXT_ULP_CLASS_HID_75133 = 0x75133,
+	BNXT_ULP_CLASS_HID_72a57 = 0x72a57,
+	BNXT_ULP_CLASS_HID_73013 = 0x73013,
+	BNXT_ULP_CLASS_HID_71433 = 0x71433,
+	BNXT_ULP_CLASS_HID_71acf = 0x71acf,
+	BNXT_ULP_CLASS_HID_74dcb = 0x74dcb,
+	BNXT_ULP_CLASS_HID_75387 = 0x75387,
+	BNXT_ULP_CLASS_HID_737a7 = 0x737a7,
+	BNXT_ULP_CLASS_HID_73e63 = 0x73e63,
+	BNXT_ULP_CLASS_HID_2b753 = 0x2b753,
+	BNXT_ULP_CLASS_HID_2bd6f = 0x2bd6f,
+	BNXT_ULP_CLASS_HID_2a10f = 0x2a10f,
+	BNXT_ULP_CLASS_HID_2a7cb = 0x2a7cb,
+	BNXT_ULP_CLASS_HID_2dac7 = 0x2dac7,
+	BNXT_ULP_CLASS_HID_28457 = 0x28457,
+	BNXT_ULP_CLASS_HID_2c4a3 = 0x2c4a3,
+	BNXT_ULP_CLASS_HID_2cb7f = 0x2cb7f,
+	BNXT_ULP_CLASS_HID_2a383 = 0x2a383,
+	BNXT_ULP_CLASS_HID_2aa5f = 0x2aa5f,
+	BNXT_ULP_CLASS_HID_28e7f = 0x28e7f,
+	BNXT_ULP_CLASS_HID_2943b = 0x2943b,
+	BNXT_ULP_CLASS_HID_2c737 = 0x2c737,
+	BNXT_ULP_CLASS_HID_2cdf3 = 0x2cdf3,
+	BNXT_ULP_CLASS_HID_2b193 = 0x2b193,
+	BNXT_ULP_CLASS_HID_2b7af = 0x2b7af,
+	BNXT_ULP_CLASS_HID_6b267 = 0x6b267,
+	BNXT_ULP_CLASS_HID_6b823 = 0x6b823,
+	BNXT_ULP_CLASS_HID_69cc3 = 0x69cc3,
+	BNXT_ULP_CLASS_HID_6a29f = 0x6a29f,
+	BNXT_ULP_CLASS_HID_6d59b = 0x6d59b,
+	BNXT_ULP_CLASS_HID_6dc57 = 0x6dc57,
+	BNXT_ULP_CLASS_HID_6c077 = 0x6c077,
+	BNXT_ULP_CLASS_HID_6c633 = 0x6c633,
+	BNXT_ULP_CLASS_HID_69f57 = 0x69f57,
+	BNXT_ULP_CLASS_HID_6a513 = 0x6a513,
+	BNXT_ULP_CLASS_HID_68933 = 0x68933,
+	BNXT_ULP_CLASS_HID_68fcf = 0x68fcf,
+	BNXT_ULP_CLASS_HID_6c2cb = 0x6c2cb,
+	BNXT_ULP_CLASS_HID_6c887 = 0x6c887,
+	BNXT_ULP_CLASS_HID_6aca7 = 0x6aca7,
+	BNXT_ULP_CLASS_HID_6b363 = 0x6b363,
+	BNXT_ULP_CLASS_HID_3cd53 = 0x3cd53,
+	BNXT_ULP_CLASS_HID_3d36f = 0x3d36f,
+	BNXT_ULP_CLASS_HID_3b70f = 0x3b70f,
+	BNXT_ULP_CLASS_HID_3bdcb = 0x3bdcb,
+	BNXT_ULP_CLASS_HID_3939b = 0x3939b,
+	BNXT_ULP_CLASS_HID_39a57 = 0x39a57,
+	BNXT_ULP_CLASS_HID_3daa3 = 0x3daa3,
+	BNXT_ULP_CLASS_HID_38433 = 0x38433,
+	BNXT_ULP_CLASS_HID_3b983 = 0x3b983,
+	BNXT_ULP_CLASS_HID_3c05f = 0x3c05f,
+	BNXT_ULP_CLASS_HID_3a47f = 0x3a47f,
+	BNXT_ULP_CLASS_HID_3aa3b = 0x3aa3b,
+	BNXT_ULP_CLASS_HID_380cb = 0x380cb,
+	BNXT_ULP_CLASS_HID_38687 = 0x38687,
+	BNXT_ULP_CLASS_HID_3c793 = 0x3c793,
+	BNXT_ULP_CLASS_HID_3cdaf = 0x3cdaf,
+	BNXT_ULP_CLASS_HID_7c867 = 0x7c867,
+	BNXT_ULP_CLASS_HID_7ce23 = 0x7ce23,
+	BNXT_ULP_CLASS_HID_7b2c3 = 0x7b2c3,
+	BNXT_ULP_CLASS_HID_7b89f = 0x7b89f,
+	BNXT_ULP_CLASS_HID_78eaf = 0x78eaf,
+	BNXT_ULP_CLASS_HID_7956b = 0x7956b,
+	BNXT_ULP_CLASS_HID_7d677 = 0x7d677,
+	BNXT_ULP_CLASS_HID_7dc33 = 0x7dc33,
+	BNXT_ULP_CLASS_HID_7b557 = 0x7b557,
+	BNXT_ULP_CLASS_HID_7bb13 = 0x7bb13,
+	BNXT_ULP_CLASS_HID_79f33 = 0x79f33,
+	BNXT_ULP_CLASS_HID_7a5cf = 0x7a5cf,
+	BNXT_ULP_CLASS_HID_7d8cb = 0x7d8cb,
+	BNXT_ULP_CLASS_HID_7825b = 0x7825b,
+	BNXT_ULP_CLASS_HID_7c2a7 = 0x7c2a7,
+	BNXT_ULP_CLASS_HID_7c963 = 0x7c963,
+	BNXT_ULP_CLASS_HID_8b4b = 0x8b4b,
+	BNXT_ULP_CLASS_HID_9177 = 0x9177,
+	BNXT_ULP_CLASS_HID_d263 = 0xd263,
+	BNXT_ULP_CLASS_HID_d82f = 0xd82f,
+	BNXT_ULP_CLASS_HID_aedf = 0xaedf,
 	BNXT_ULP_CLASS_HID_b49b = 0xb49b,
-	BNXT_ULP_CLASS_HID_b7db = 0xb7db,
-	BNXT_ULP_CLASS_HID_fa1b = 0xfa1b,
-	BNXT_ULP_CLASS_HID_fd5b = 0xfd5b,
-	BNXT_ULP_CLASS_HID_b04f = 0xb04f,
-	BNXT_ULP_CLASS_HID_b28f = 0xb28f,
-	BNXT_ULP_CLASS_HID_f5cf = 0xf5cf,
-	BNXT_ULP_CLASS_HID_f80f = 0xf80f,
-	BNXT_ULP_CLASS_HID_1c64f = 0x1c64f,
-	BNXT_ULP_CLASS_HID_1e88f = 0x1e88f,
-	BNXT_ULP_CLASS_HID_1cbcf = 0x1cbcf,
-	BNXT_ULP_CLASS_HID_1ee0f = 0x1ee0f,
+	BNXT_ULP_CLASS_HID_98bb = 0x98bb,
+	BNXT_ULP_CLASS_HID_9f67 = 0x9f67,
+	BNXT_ULP_CLASS_HID_4867f = 0x4867f,
+	BNXT_ULP_CLASS_HID_48c3b = 0x48c3b,
+	BNXT_ULP_CLASS_HID_4cd17 = 0x4cd17,
+	BNXT_ULP_CLASS_HID_4d3d3 = 0x4d3d3,
+	BNXT_ULP_CLASS_HID_4a983 = 0x4a983,
+	BNXT_ULP_CLASS_HID_4b04f = 0x4b04f,
+	BNXT_ULP_CLASS_HID_4946f = 0x4946f,
+	BNXT_ULP_CLASS_HID_49a2b = 0x49a2b,
+	BNXT_ULP_CLASS_HID_1a14b = 0x1a14b,
+	BNXT_ULP_CLASS_HID_1a777 = 0x1a777,
+	BNXT_ULP_CLASS_HID_18b17 = 0x18b17,
+	BNXT_ULP_CLASS_HID_191d3 = 0x191d3,
+	BNXT_ULP_CLASS_HID_1c4df = 0x1c4df,
 	BNXT_ULP_CLASS_HID_1ca9b = 0x1ca9b,
-	BNXT_ULP_CLASS_HID_1eddb = 0x1eddb,
-	BNXT_ULP_CLASS_HID_1d01b = 0x1d01b,
-	BNXT_ULP_CLASS_HID_1f35b = 0x1f35b,
-	BNXT_ULP_CLASS_HID_8b4b = 0x8b4b,
-	BNXT_ULP_CLASS_HID_ad8b = 0xad8b,
+	BNXT_ULP_CLASS_HID_1aebb = 0x1aebb,
+	BNXT_ULP_CLASS_HID_1b567 = 0x1b567,
+	BNXT_ULP_CLASS_HID_59c7f = 0x59c7f,
+	BNXT_ULP_CLASS_HID_5a23b = 0x5a23b,
+	BNXT_ULP_CLASS_HID_586db = 0x586db,
+	BNXT_ULP_CLASS_HID_58c87 = 0x58c87,
+	BNXT_ULP_CLASS_HID_5bf83 = 0x5bf83,
+	BNXT_ULP_CLASS_HID_5c64f = 0x5c64f,
+	BNXT_ULP_CLASS_HID_5aa6f = 0x5aa6f,
+	BNXT_ULP_CLASS_HID_5b02b = 0x5b02b,
 	BNXT_ULP_CLASS_HID_d0cb = 0xd0cb,
-	BNXT_ULP_CLASS_HID_f30b = 0xf30b,
-	BNXT_ULP_CLASS_HID_867f = 0x867f,
-	BNXT_ULP_CLASS_HID_a8bf = 0xa8bf,
-	BNXT_ULP_CLASS_HID_cbff = 0xcbff,
-	BNXT_ULP_CLASS_HID_ee3f = 0xee3f,
-	BNXT_ULP_CLASS_HID_19c7f = 0x19c7f,
-	BNXT_ULP_CLASS_HID_1bebf = 0x1bebf,
-	BNXT_ULP_CLASS_HID_1e1ff = 0x1e1ff,
-	BNXT_ULP_CLASS_HID_1e43f = 0x1e43f,
-	BNXT_ULP_CLASS_HID_1a14b = 0x1a14b,
-	BNXT_ULP_CLASS_HID_1a38b = 0x1a38b,
+	BNXT_ULP_CLASS_HID_d6f7 = 0xd6f7,
+	BNXT_ULP_CLASS_HID_d7e3 = 0xd7e3,
+	BNXT_ULP_CLASS_HID_c153 = 0xc153,
+	BNXT_ULP_CLASS_HID_f45f = 0xf45f,
+	BNXT_ULP_CLASS_HID_fa1b = 0xfa1b,
+	BNXT_ULP_CLASS_HID_de3b = 0xde3b,
+	BNXT_ULP_CLASS_HID_e4e7 = 0xe4e7,
+	BNXT_ULP_CLASS_HID_4cbff = 0x4cbff,
+	BNXT_ULP_CLASS_HID_4d1bb = 0x4d1bb,
+	BNXT_ULP_CLASS_HID_4d297 = 0x4d297,
+	BNXT_ULP_CLASS_HID_4d953 = 0x4d953,
+	BNXT_ULP_CLASS_HID_4ef03 = 0x4ef03,
+	BNXT_ULP_CLASS_HID_4f5cf = 0x4f5cf,
+	BNXT_ULP_CLASS_HID_4d9ef = 0x4d9ef,
+	BNXT_ULP_CLASS_HID_4dfab = 0x4dfab,
 	BNXT_ULP_CLASS_HID_1e6cb = 0x1e6cb,
-	BNXT_ULP_CLASS_HID_1e90b = 0x1e90b,
-	BNXT_ULP_CLASS_HID_aedf = 0xaedf,
+	BNXT_ULP_CLASS_HID_1ecf7 = 0x1ecf7,
+	BNXT_ULP_CLASS_HID_1d097 = 0x1d097,
+	BNXT_ULP_CLASS_HID_1d753 = 0x1d753,
+	BNXT_ULP_CLASS_HID_1ca5f = 0x1ca5f,
+	BNXT_ULP_CLASS_HID_1d01b = 0x1d01b,
+	BNXT_ULP_CLASS_HID_1f43b = 0x1f43b,
+	BNXT_ULP_CLASS_HID_1fae7 = 0x1fae7,
+	BNXT_ULP_CLASS_HID_5e1ff = 0x5e1ff,
+	BNXT_ULP_CLASS_HID_5e7bb = 0x5e7bb,
+	BNXT_ULP_CLASS_HID_5cc5b = 0x5cc5b,
+	BNXT_ULP_CLASS_HID_5d207 = 0x5d207,
+	BNXT_ULP_CLASS_HID_5c503 = 0x5c503,
+	BNXT_ULP_CLASS_HID_5cbcf = 0x5cbcf,
+	BNXT_ULP_CLASS_HID_5efef = 0x5efef,
+	BNXT_ULP_CLASS_HID_5f5ab = 0x5f5ab,
+	BNXT_ULP_CLASS_HID_ad8b = 0xad8b,
+	BNXT_ULP_CLASS_HID_b3b7 = 0xb3b7,
+	BNXT_ULP_CLASS_HID_f4a3 = 0xf4a3,
+	BNXT_ULP_CLASS_HID_fb6f = 0xfb6f,
 	BNXT_ULP_CLASS_HID_b11f = 0xb11f,
-	BNXT_ULP_CLASS_HID_f45f = 0xf45f,
-	BNXT_ULP_CLASS_HID_f69f = 0xf69f,
-	BNXT_ULP_CLASS_HID_a983 = 0xa983,
-	BNXT_ULP_CLASS_HID_acc3 = 0xacc3,
-	BNXT_ULP_CLASS_HID_ef03 = 0xef03,
-	BNXT_ULP_CLASS_HID_f243 = 0xf243,
-	BNXT_ULP_CLASS_HID_1bf83 = 0x1bf83,
-	BNXT_ULP_CLASS_HID_1e2c3 = 0x1e2c3,
-	BNXT_ULP_CLASS_HID_1c503 = 0x1c503,
-	BNXT_ULP_CLASS_HID_1e843 = 0x1e843,
-	BNXT_ULP_CLASS_HID_1c4df = 0x1c4df,
+	BNXT_ULP_CLASS_HID_b7db = 0xb7db,
+	BNXT_ULP_CLASS_HID_bbfb = 0xbbfb,
+	BNXT_ULP_CLASS_HID_a1a7 = 0xa1a7,
+	BNXT_ULP_CLASS_HID_4a8bf = 0x4a8bf,
+	BNXT_ULP_CLASS_HID_4af7b = 0x4af7b,
+	BNXT_ULP_CLASS_HID_4f057 = 0x4f057,
+	BNXT_ULP_CLASS_HID_4f613 = 0x4f613,
+	BNXT_ULP_CLASS_HID_4acc3 = 0x4acc3,
+	BNXT_ULP_CLASS_HID_4b28f = 0x4b28f,
+	BNXT_ULP_CLASS_HID_4b6af = 0x4b6af,
+	BNXT_ULP_CLASS_HID_4bd6b = 0x4bd6b,
+	BNXT_ULP_CLASS_HID_1a38b = 0x1a38b,
+	BNXT_ULP_CLASS_HID_1a9b7 = 0x1a9b7,
+	BNXT_ULP_CLASS_HID_1ae57 = 0x1ae57,
+	BNXT_ULP_CLASS_HID_1b413 = 0x1b413,
 	BNXT_ULP_CLASS_HID_1e71f = 0x1e71f,
-	BNXT_ULP_CLASS_HID_1ca5f = 0x1ca5f,
+	BNXT_ULP_CLASS_HID_1eddb = 0x1eddb,
+	BNXT_ULP_CLASS_HID_1b1fb = 0x1b1fb,
+	BNXT_ULP_CLASS_HID_1b7a7 = 0x1b7a7,
+	BNXT_ULP_CLASS_HID_5bebf = 0x5bebf,
+	BNXT_ULP_CLASS_HID_5a57b = 0x5a57b,
+	BNXT_ULP_CLASS_HID_5a91b = 0x5a91b,
+	BNXT_ULP_CLASS_HID_5afc7 = 0x5afc7,
+	BNXT_ULP_CLASS_HID_5e2c3 = 0x5e2c3,
+	BNXT_ULP_CLASS_HID_5e88f = 0x5e88f,
+	BNXT_ULP_CLASS_HID_5acaf = 0x5acaf,
+	BNXT_ULP_CLASS_HID_5b36b = 0x5b36b,
+	BNXT_ULP_CLASS_HID_f30b = 0xf30b,
+	BNXT_ULP_CLASS_HID_f937 = 0xf937,
+	BNXT_ULP_CLASS_HID_fa23 = 0xfa23,
+	BNXT_ULP_CLASS_HID_e393 = 0xe393,
+	BNXT_ULP_CLASS_HID_f69f = 0xf69f,
+	BNXT_ULP_CLASS_HID_fd5b = 0xfd5b,
+	BNXT_ULP_CLASS_HID_e17b = 0xe17b,
+	BNXT_ULP_CLASS_HID_e727 = 0xe727,
+	BNXT_ULP_CLASS_HID_4ee3f = 0x4ee3f,
+	BNXT_ULP_CLASS_HID_4f4fb = 0x4f4fb,
+	BNXT_ULP_CLASS_HID_4f5d7 = 0x4f5d7,
+	BNXT_ULP_CLASS_HID_4fb93 = 0x4fb93,
+	BNXT_ULP_CLASS_HID_4f243 = 0x4f243,
+	BNXT_ULP_CLASS_HID_4f80f = 0x4f80f,
+	BNXT_ULP_CLASS_HID_4fc2f = 0x4fc2f,
+	BNXT_ULP_CLASS_HID_4e2eb = 0x4e2eb,
+	BNXT_ULP_CLASS_HID_1e90b = 0x1e90b,
+	BNXT_ULP_CLASS_HID_1ef37 = 0x1ef37,
+	BNXT_ULP_CLASS_HID_1f3d7 = 0x1f3d7,
+	BNXT_ULP_CLASS_HID_1f993 = 0x1f993,
 	BNXT_ULP_CLASS_HID_1ec9f = 0x1ec9f,
-	BNXT_ULP_CLASS_HID_2523 = 0x2523,
-	BNXT_ULP_CLASS_HID_2bef = 0x2bef,
-	BNXT_ULP_CLASS_HID_2693 = 0x2693,
-	BNXT_ULP_CLASS_HID_4f73 = 0x4f73,
-	BNXT_ULP_CLASS_HID_4a27 = 0x4a27,
-	BNXT_ULP_CLASS_HID_164b = 0x164b,
-	BNXT_ULP_CLASS_HID_117f = 0x117f,
-	BNXT_ULP_CLASS_HID_39df = 0x39df,
-	BNXT_ULP_CLASS_HID_3483 = 0x3483,
-	BNXT_ULP_CLASS_HID_20d7 = 0x20d7,
-	BNXT_ULP_CLASS_HID_48b7 = 0x48b7,
-	BNXT_ULP_CLASS_HID_447b = 0x447b,
-	BNXT_ULP_CLASS_HID_0f8f = 0x0f8f,
-	BNXT_ULP_CLASS_HID_0ab3 = 0x0ab3,
-	BNXT_ULP_CLASS_HID_3313 = 0x3313,
-	BNXT_ULP_CLASS_HID_2ec7 = 0x2ec7,
-	BNXT_ULP_CLASS_HID_257b7 = 0x257b7,
-	BNXT_ULP_CLASS_HID_24467 = 0x24467,
-	BNXT_ULP_CLASS_HID_23fbb = 0x23fbb,
-	BNXT_ULP_CLASS_HID_252cb = 0x252cb,
-	BNXT_ULP_CLASS_HID_21e7f = 0x21e7f,
-	BNXT_ULP_CLASS_HID_20b2f = 0x20b2f,
-	BNXT_ULP_CLASS_HID_20663 = 0x20663,
-	BNXT_ULP_CLASS_HID_219b3 = 0x219b3,
-	BNXT_ULP_CLASS_HID_24213 = 0x24213,
-	BNXT_ULP_CLASS_HID_22ec3 = 0x22ec3,
-	BNXT_ULP_CLASS_HID_22a17 = 0x22a17,
-	BNXT_ULP_CLASS_HID_23d27 = 0x23d27,
-	BNXT_ULP_CLASS_HID_208db = 0x208db,
-	BNXT_ULP_CLASS_HID_25277 = 0x25277,
-	BNXT_ULP_CLASS_HID_24d8b = 0x24d8b,
-	BNXT_ULP_CLASS_HID_203ef = 0x203ef,
-	BNXT_ULP_CLASS_HID_2517b = 0x2517b,
-	BNXT_ULP_CLASS_HID_23e2b = 0x23e2b,
-	BNXT_ULP_CLASS_HID_2397f = 0x2397f,
-	BNXT_ULP_CLASS_HID_24c8f = 0x24c8f,
-	BNXT_ULP_CLASS_HID_21823 = 0x21823,
-	BNXT_ULP_CLASS_HID_20513 = 0x20513,
-	BNXT_ULP_CLASS_HID_20027 = 0x20027,
-	BNXT_ULP_CLASS_HID_21377 = 0x21377,
-	BNXT_ULP_CLASS_HID_23bd7 = 0x23bd7,
-	BNXT_ULP_CLASS_HID_22887 = 0x22887,
-	BNXT_ULP_CLASS_HID_223db = 0x223db,
-	BNXT_ULP_CLASS_HID_236eb = 0x236eb,
-	BNXT_ULP_CLASS_HID_2029f = 0x2029f,
-	BNXT_ULP_CLASS_HID_24c3b = 0x24c3b,
-	BNXT_ULP_CLASS_HID_2474f = 0x2474f,
-	BNXT_ULP_CLASS_HID_25a9f = 0x25a9f,
-	BNXT_ULP_CLASS_HID_24b3f = 0x24b3f,
-	BNXT_ULP_CLASS_HID_237ef = 0x237ef,
-	BNXT_ULP_CLASS_HID_23323 = 0x23323,
-	BNXT_ULP_CLASS_HID_24673 = 0x24673,
-	BNXT_ULP_CLASS_HID_211e7 = 0x211e7,
-	BNXT_ULP_CLASS_HID_25b83 = 0x25b83,
-	BNXT_ULP_CLASS_HID_256d7 = 0x256d7,
-	BNXT_ULP_CLASS_HID_20d3b = 0x20d3b,
-	BNXT_ULP_CLASS_HID_2359b = 0x2359b,
-	BNXT_ULP_CLASS_HID_2224b = 0x2224b,
-	BNXT_ULP_CLASS_HID_21d9f = 0x21d9f,
-	BNXT_ULP_CLASS_HID_230af = 0x230af,
-	BNXT_ULP_CLASS_HID_2590f = 0x2590f,
-	BNXT_ULP_CLASS_HID_245ff = 0x245ff,
-	BNXT_ULP_CLASS_HID_24133 = 0x24133,
-	BNXT_ULP_CLASS_HID_25443 = 0x25443,
-	BNXT_ULP_CLASS_HID_244e3 = 0x244e3,
-	BNXT_ULP_CLASS_HID_231d3 = 0x231d3,
-	BNXT_ULP_CLASS_HID_22ce7 = 0x22ce7,
-	BNXT_ULP_CLASS_HID_24037 = 0x24037,
-	BNXT_ULP_CLASS_HID_20bab = 0x20bab,
-	BNXT_ULP_CLASS_HID_25547 = 0x25547,
-	BNXT_ULP_CLASS_HID_2509b = 0x2509b,
-	BNXT_ULP_CLASS_HID_206ff = 0x206ff,
-	BNXT_ULP_CLASS_HID_22f5f = 0x22f5f,
-	BNXT_ULP_CLASS_HID_21c0f = 0x21c0f,
-	BNXT_ULP_CLASS_HID_21743 = 0x21743,
-	BNXT_ULP_CLASS_HID_22a93 = 0x22a93,
-	BNXT_ULP_CLASS_HID_252f3 = 0x252f3,
-	BNXT_ULP_CLASS_HID_23fa3 = 0x23fa3,
-	BNXT_ULP_CLASS_HID_23af7 = 0x23af7,
-	BNXT_ULP_CLASS_HID_24e07 = 0x24e07,
-	BNXT_ULP_CLASS_HID_2322f = 0x2322f,
-	BNXT_ULP_CLASS_HID_21f1f = 0x21f1f,
-	BNXT_ULP_CLASS_HID_21a53 = 0x21a53,
-	BNXT_ULP_CLASS_HID_22d63 = 0x22d63,
-	BNXT_ULP_CLASS_HID_255c3 = 0x255c3,
-	BNXT_ULP_CLASS_HID_242b3 = 0x242b3,
-	BNXT_ULP_CLASS_HID_23dc7 = 0x23dc7,
-	BNXT_ULP_CLASS_HID_25117 = 0x25117,
-	BNXT_ULP_CLASS_HID_22c13 = 0x22c13,
-	BNXT_ULP_CLASS_HID_218c3 = 0x218c3,
-	BNXT_ULP_CLASS_HID_21417 = 0x21417,
-	BNXT_ULP_CLASS_HID_22727 = 0x22727,
-	BNXT_ULP_CLASS_HID_24f87 = 0x24f87,
-	BNXT_ULP_CLASS_HID_23c77 = 0x23c77,
-	BNXT_ULP_CLASS_HID_2378b = 0x2378b,
-	BNXT_ULP_CLASS_HID_24adb = 0x24adb,
+	BNXT_ULP_CLASS_HID_1f35b = 0x1f35b,
+	BNXT_ULP_CLASS_HID_1f77b = 0x1f77b,
+	BNXT_ULP_CLASS_HID_1fd27 = 0x1fd27,
+	BNXT_ULP_CLASS_HID_5e43f = 0x5e43f,
+	BNXT_ULP_CLASS_HID_5eafb = 0x5eafb,
+	BNXT_ULP_CLASS_HID_5ee9b = 0x5ee9b,
+	BNXT_ULP_CLASS_HID_5f547 = 0x5f547,
+	BNXT_ULP_CLASS_HID_5e843 = 0x5e843,
+	BNXT_ULP_CLASS_HID_5ee0f = 0x5ee0f,
+	BNXT_ULP_CLASS_HID_5f22f = 0x5f22f,
+	BNXT_ULP_CLASS_HID_5f8eb = 0x5f8eb,
+	BNXT_ULP_CLASS_HID_2579 = 0x2579,
+	BNXT_ULP_CLASS_HID_2bb5 = 0x2bb5,
+	BNXT_ULP_CLASS_HID_4591 = 0x4591,
+	BNXT_ULP_CLASS_HID_4bad = 0x4bad,
+	BNXT_ULP_CLASS_HID_2561 = 0x2561,
+	BNXT_ULP_CLASS_HID_2bad = 0x2bad,
+	BNXT_ULP_CLASS_HID_5bdd = 0x5bdd,
+	BNXT_ULP_CLASS_HID_054d = 0x054d,
 	BNXT_ULP_CLASS_HID_257b = 0x257b,
 	BNXT_ULP_CLASS_HID_2bb7 = 0x2bb7,
-	BNXT_ULP_CLASS_HID_1867 = 0x1867,
-	BNXT_ULP_CLASS_HID_4f2b = 0x4f2b,
-	BNXT_ULP_CLASS_HID_3c1b = 0x3c1b,
+	BNXT_ULP_CLASS_HID_0fd7 = 0x0fd7,
 	BNXT_ULP_CLASS_HID_1613 = 0x1613,
-	BNXT_ULP_CLASS_HID_02c3 = 0x02c3,
+	BNXT_ULP_CLASS_HID_48ef = 0x48ef,
+	BNXT_ULP_CLASS_HID_4f2b = 0x4f2b,
+	BNXT_ULP_CLASS_HID_334b = 0x334b,
 	BNXT_ULP_CLASS_HID_3987 = 0x3987,
-	BNXT_ULP_CLASS_HID_2677 = 0x2677,
 	BNXT_ULP_CLASS_HID_122b = 0x122b,
-	BNXT_ULP_CLASS_HID_48ef = 0x48ef,
-	BNXT_ULP_CLASS_HID_35df = 0x35df,
-	BNXT_ULP_CLASS_HID_0fd7 = 0x0fd7,
+	BNXT_ULP_CLASS_HID_1867 = 0x1867,
 	BNXT_ULP_CLASS_HID_5973 = 0x5973,
-	BNXT_ULP_CLASS_HID_334b = 0x334b,
+	BNXT_ULP_CLASS_HID_02c3 = 0x02c3,
+	BNXT_ULP_CLASS_HID_35df = 0x35df,
+	BNXT_ULP_CLASS_HID_3c1b = 0x3c1b,
 	BNXT_ULP_CLASS_HID_203b = 0x203b,
-	BNXT_ULP_CLASS_HID_25797 = 0x25797,
-	BNXT_ULP_CLASS_HID_285eb = 0x285eb,
-	BNXT_ULP_CLASS_HID_310eb = 0x310eb,
-	BNXT_ULP_CLASS_HID_39beb = 0x39beb,
-	BNXT_ULP_CLASS_HID_24447 = 0x24447,
-	BNXT_ULP_CLASS_HID_2cf47 = 0x2cf47,
-	BNXT_ULP_CLASS_HID_35a47 = 0x35a47,
-	BNXT_ULP_CLASS_HID_3889b = 0x3889b,
-	BNXT_ULP_CLASS_HID_23f9b = 0x23f9b,
-	BNXT_ULP_CLASS_HID_2ca9b = 0x2ca9b,
-	BNXT_ULP_CLASS_HID_3559b = 0x3559b,
-	BNXT_ULP_CLASS_HID_383ef = 0x383ef,
-	BNXT_ULP_CLASS_HID_252eb = 0x252eb,
-	BNXT_ULP_CLASS_HID_2813f = 0x2813f,
-	BNXT_ULP_CLASS_HID_30c3f = 0x30c3f,
-	BNXT_ULP_CLASS_HID_3973f = 0x3973f,
-	BNXT_ULP_CLASS_HID_21e5f = 0x21e5f,
-	BNXT_ULP_CLASS_HID_2a95f = 0x2a95f,
-	BNXT_ULP_CLASS_HID_3345f = 0x3345f,
-	BNXT_ULP_CLASS_HID_3bf5f = 0x3bf5f,
-	BNXT_ULP_CLASS_HID_20b0f = 0x20b0f,
-	BNXT_ULP_CLASS_HID_2960f = 0x2960f,
-	BNXT_ULP_CLASS_HID_3210f = 0x3210f,
-	BNXT_ULP_CLASS_HID_3ac0f = 0x3ac0f,
-	BNXT_ULP_CLASS_HID_20643 = 0x20643,
-	BNXT_ULP_CLASS_HID_29143 = 0x29143,
-	BNXT_ULP_CLASS_HID_31c43 = 0x31c43,
-	BNXT_ULP_CLASS_HID_3a743 = 0x3a743,
-	BNXT_ULP_CLASS_HID_21993 = 0x21993,
-	BNXT_ULP_CLASS_HID_2a493 = 0x2a493,
-	BNXT_ULP_CLASS_HID_32f93 = 0x32f93,
-	BNXT_ULP_CLASS_HID_3ba93 = 0x3ba93,
-	BNXT_ULP_CLASS_HID_24233 = 0x24233,
-	BNXT_ULP_CLASS_HID_2cd33 = 0x2cd33,
-	BNXT_ULP_CLASS_HID_35833 = 0x35833,
-	BNXT_ULP_CLASS_HID_38607 = 0x38607,
-	BNXT_ULP_CLASS_HID_22ee3 = 0x22ee3,
-	BNXT_ULP_CLASS_HID_2b9e3 = 0x2b9e3,
-	BNXT_ULP_CLASS_HID_344e3 = 0x344e3,
-	BNXT_ULP_CLASS_HID_3cfe3 = 0x3cfe3,
-	BNXT_ULP_CLASS_HID_22a37 = 0x22a37,
-	BNXT_ULP_CLASS_HID_2b537 = 0x2b537,
-	BNXT_ULP_CLASS_HID_34037 = 0x34037,
-	BNXT_ULP_CLASS_HID_3cb37 = 0x3cb37,
-	BNXT_ULP_CLASS_HID_23d07 = 0x23d07,
-	BNXT_ULP_CLASS_HID_2c807 = 0x2c807,
-	BNXT_ULP_CLASS_HID_35307 = 0x35307,
-	BNXT_ULP_CLASS_HID_3815b = 0x3815b,
-	BNXT_ULP_CLASS_HID_208fb = 0x208fb,
-	BNXT_ULP_CLASS_HID_293fb = 0x293fb,
-	BNXT_ULP_CLASS_HID_31efb = 0x31efb,
-	BNXT_ULP_CLASS_HID_3a9fb = 0x3a9fb,
-	BNXT_ULP_CLASS_HID_25257 = 0x25257,
-	BNXT_ULP_CLASS_HID_280ab = 0x280ab,
-	BNXT_ULP_CLASS_HID_30bab = 0x30bab,
-	BNXT_ULP_CLASS_HID_396ab = 0x396ab,
-	BNXT_ULP_CLASS_HID_24dab = 0x24dab,
-	BNXT_ULP_CLASS_HID_2d8ab = 0x2d8ab,
-	BNXT_ULP_CLASS_HID_306ff = 0x306ff,
-	BNXT_ULP_CLASS_HID_391ff = 0x391ff,
-	BNXT_ULP_CLASS_HID_203cf = 0x203cf,
-	BNXT_ULP_CLASS_HID_28ecf = 0x28ecf,
-	BNXT_ULP_CLASS_HID_319cf = 0x319cf,
-	BNXT_ULP_CLASS_HID_3a4cf = 0x3a4cf,
-	BNXT_ULP_CLASS_HID_2515b = 0x2515b,
-	BNXT_ULP_CLASS_HID_2dc5b = 0x2dc5b,
-	BNXT_ULP_CLASS_HID_30aaf = 0x30aaf,
-	BNXT_ULP_CLASS_HID_395af = 0x395af,
-	BNXT_ULP_CLASS_HID_23e0b = 0x23e0b,
-	BNXT_ULP_CLASS_HID_2c90b = 0x2c90b,
-	BNXT_ULP_CLASS_HID_3540b = 0x3540b,
-	BNXT_ULP_CLASS_HID_3825f = 0x3825f,
-	BNXT_ULP_CLASS_HID_2395f = 0x2395f,
-	BNXT_ULP_CLASS_HID_2c45f = 0x2c45f,
-	BNXT_ULP_CLASS_HID_34f5f = 0x34f5f,
-	BNXT_ULP_CLASS_HID_3da5f = 0x3da5f,
-	BNXT_ULP_CLASS_HID_24caf = 0x24caf,
-	BNXT_ULP_CLASS_HID_2d7af = 0x2d7af,
-	BNXT_ULP_CLASS_HID_305e3 = 0x305e3,
-	BNXT_ULP_CLASS_HID_390e3 = 0x390e3,
-	BNXT_ULP_CLASS_HID_21803 = 0x21803,
-	BNXT_ULP_CLASS_HID_2a303 = 0x2a303,
-	BNXT_ULP_CLASS_HID_32e03 = 0x32e03,
-	BNXT_ULP_CLASS_HID_3b903 = 0x3b903,
-	BNXT_ULP_CLASS_HID_20533 = 0x20533,
-	BNXT_ULP_CLASS_HID_29033 = 0x29033,
-	BNXT_ULP_CLASS_HID_31b33 = 0x31b33,
-	BNXT_ULP_CLASS_HID_3a633 = 0x3a633,
-	BNXT_ULP_CLASS_HID_20007 = 0x20007,
-	BNXT_ULP_CLASS_HID_28b07 = 0x28b07,
-	BNXT_ULP_CLASS_HID_31607 = 0x31607,
-	BNXT_ULP_CLASS_HID_3a107 = 0x3a107,
-	BNXT_ULP_CLASS_HID_21357 = 0x21357,
-	BNXT_ULP_CLASS_HID_29e57 = 0x29e57,
-	BNXT_ULP_CLASS_HID_32957 = 0x32957,
-	BNXT_ULP_CLASS_HID_3b457 = 0x3b457,
-	BNXT_ULP_CLASS_HID_23bf7 = 0x23bf7,
-	BNXT_ULP_CLASS_HID_2c6f7 = 0x2c6f7,
-	BNXT_ULP_CLASS_HID_351f7 = 0x351f7,
-	BNXT_ULP_CLASS_HID_3dcf7 = 0x3dcf7,
-	BNXT_ULP_CLASS_HID_228a7 = 0x228a7,
-	BNXT_ULP_CLASS_HID_2b3a7 = 0x2b3a7,
-	BNXT_ULP_CLASS_HID_33ea7 = 0x33ea7,
-	BNXT_ULP_CLASS_HID_3c9a7 = 0x3c9a7,
-	BNXT_ULP_CLASS_HID_223fb = 0x223fb,
-	BNXT_ULP_CLASS_HID_2aefb = 0x2aefb,
-	BNXT_ULP_CLASS_HID_339fb = 0x339fb,
-	BNXT_ULP_CLASS_HID_3c4fb = 0x3c4fb,
-	BNXT_ULP_CLASS_HID_236cb = 0x236cb,
-	BNXT_ULP_CLASS_HID_2c1cb = 0x2c1cb,
-	BNXT_ULP_CLASS_HID_34ccb = 0x34ccb,
-	BNXT_ULP_CLASS_HID_3d7cb = 0x3d7cb,
-	BNXT_ULP_CLASS_HID_202bf = 0x202bf,
-	BNXT_ULP_CLASS_HID_28dbf = 0x28dbf,
-	BNXT_ULP_CLASS_HID_318bf = 0x318bf,
-	BNXT_ULP_CLASS_HID_3a3bf = 0x3a3bf,
-	BNXT_ULP_CLASS_HID_24c1b = 0x24c1b,
-	BNXT_ULP_CLASS_HID_2d71b = 0x2d71b,
-	BNXT_ULP_CLASS_HID_3056f = 0x3056f,
-	BNXT_ULP_CLASS_HID_3906f = 0x3906f,
-	BNXT_ULP_CLASS_HID_2476f = 0x2476f,
-	BNXT_ULP_CLASS_HID_2d26f = 0x2d26f,
-	BNXT_ULP_CLASS_HID_300a3 = 0x300a3,
-	BNXT_ULP_CLASS_HID_38ba3 = 0x38ba3,
-	BNXT_ULP_CLASS_HID_25abf = 0x25abf,
-	BNXT_ULP_CLASS_HID_288f3 = 0x288f3,
-	BNXT_ULP_CLASS_HID_313f3 = 0x313f3,
-	BNXT_ULP_CLASS_HID_39ef3 = 0x39ef3,
-	BNXT_ULP_CLASS_HID_24b1f = 0x24b1f,
-	BNXT_ULP_CLASS_HID_2d61f = 0x2d61f,
-	BNXT_ULP_CLASS_HID_30453 = 0x30453,
-	BNXT_ULP_CLASS_HID_38f53 = 0x38f53,
-	BNXT_ULP_CLASS_HID_237cf = 0x237cf,
-	BNXT_ULP_CLASS_HID_2c2cf = 0x2c2cf,
-	BNXT_ULP_CLASS_HID_34dcf = 0x34dcf,
-	BNXT_ULP_CLASS_HID_3d8cf = 0x3d8cf,
-	BNXT_ULP_CLASS_HID_23303 = 0x23303,
-	BNXT_ULP_CLASS_HID_2be03 = 0x2be03,
-	BNXT_ULP_CLASS_HID_34903 = 0x34903,
-	BNXT_ULP_CLASS_HID_3d403 = 0x3d403,
-	BNXT_ULP_CLASS_HID_24653 = 0x24653,
-	BNXT_ULP_CLASS_HID_2d153 = 0x2d153,
-	BNXT_ULP_CLASS_HID_35c53 = 0x35c53,
-	BNXT_ULP_CLASS_HID_38aa7 = 0x38aa7,
-	BNXT_ULP_CLASS_HID_211c7 = 0x211c7,
-	BNXT_ULP_CLASS_HID_29cc7 = 0x29cc7,
-	BNXT_ULP_CLASS_HID_327c7 = 0x327c7,
-	BNXT_ULP_CLASS_HID_3b2c7 = 0x3b2c7,
-	BNXT_ULP_CLASS_HID_25ba3 = 0x25ba3,
-	BNXT_ULP_CLASS_HID_289f7 = 0x289f7,
-	BNXT_ULP_CLASS_HID_314f7 = 0x314f7,
-	BNXT_ULP_CLASS_HID_39ff7 = 0x39ff7,
-	BNXT_ULP_CLASS_HID_256f7 = 0x256f7,
-	BNXT_ULP_CLASS_HID_284cb = 0x284cb,
-	BNXT_ULP_CLASS_HID_30fcb = 0x30fcb,
-	BNXT_ULP_CLASS_HID_39acb = 0x39acb,
-	BNXT_ULP_CLASS_HID_20d1b = 0x20d1b,
-	BNXT_ULP_CLASS_HID_2981b = 0x2981b,
-	BNXT_ULP_CLASS_HID_3231b = 0x3231b,
-	BNXT_ULP_CLASS_HID_3ae1b = 0x3ae1b,
-	BNXT_ULP_CLASS_HID_235bb = 0x235bb,
-	BNXT_ULP_CLASS_HID_2c0bb = 0x2c0bb,
-	BNXT_ULP_CLASS_HID_34bbb = 0x34bbb,
-	BNXT_ULP_CLASS_HID_3d6bb = 0x3d6bb,
-	BNXT_ULP_CLASS_HID_2226b = 0x2226b,
-	BNXT_ULP_CLASS_HID_2ad6b = 0x2ad6b,
-	BNXT_ULP_CLASS_HID_3386b = 0x3386b,
-	BNXT_ULP_CLASS_HID_3c36b = 0x3c36b,
-	BNXT_ULP_CLASS_HID_21dbf = 0x21dbf,
-	BNXT_ULP_CLASS_HID_2a8bf = 0x2a8bf,
-	BNXT_ULP_CLASS_HID_333bf = 0x333bf,
-	BNXT_ULP_CLASS_HID_3bebf = 0x3bebf,
-	BNXT_ULP_CLASS_HID_2308f = 0x2308f,
-	BNXT_ULP_CLASS_HID_2bb8f = 0x2bb8f,
-	BNXT_ULP_CLASS_HID_3468f = 0x3468f,
-	BNXT_ULP_CLASS_HID_3d18f = 0x3d18f,
-	BNXT_ULP_CLASS_HID_2592f = 0x2592f,
-	BNXT_ULP_CLASS_HID_28763 = 0x28763,
-	BNXT_ULP_CLASS_HID_31263 = 0x31263,
-	BNXT_ULP_CLASS_HID_39d63 = 0x39d63,
-	BNXT_ULP_CLASS_HID_245df = 0x245df,
-	BNXT_ULP_CLASS_HID_2d0df = 0x2d0df,
-	BNXT_ULP_CLASS_HID_35bdf = 0x35bdf,
-	BNXT_ULP_CLASS_HID_38a13 = 0x38a13,
-	BNXT_ULP_CLASS_HID_24113 = 0x24113,
-	BNXT_ULP_CLASS_HID_2cc13 = 0x2cc13,
-	BNXT_ULP_CLASS_HID_35713 = 0x35713,
-	BNXT_ULP_CLASS_HID_38567 = 0x38567,
-	BNXT_ULP_CLASS_HID_25463 = 0x25463,
-	BNXT_ULP_CLASS_HID_282b7 = 0x282b7,
-	BNXT_ULP_CLASS_HID_30db7 = 0x30db7,
-	BNXT_ULP_CLASS_HID_398b7 = 0x398b7,
-	BNXT_ULP_CLASS_HID_244c3 = 0x244c3,
-	BNXT_ULP_CLASS_HID_2cfc3 = 0x2cfc3,
-	BNXT_ULP_CLASS_HID_35ac3 = 0x35ac3,
-	BNXT_ULP_CLASS_HID_38917 = 0x38917,
-	BNXT_ULP_CLASS_HID_231f3 = 0x231f3,
-	BNXT_ULP_CLASS_HID_2bcf3 = 0x2bcf3,
-	BNXT_ULP_CLASS_HID_347f3 = 0x347f3,
-	BNXT_ULP_CLASS_HID_3d2f3 = 0x3d2f3,
-	BNXT_ULP_CLASS_HID_22cc7 = 0x22cc7,
-	BNXT_ULP_CLASS_HID_2b7c7 = 0x2b7c7,
-	BNXT_ULP_CLASS_HID_342c7 = 0x342c7,
-	BNXT_ULP_CLASS_HID_3cdc7 = 0x3cdc7,
-	BNXT_ULP_CLASS_HID_24017 = 0x24017,
-	BNXT_ULP_CLASS_HID_2cb17 = 0x2cb17,
-	BNXT_ULP_CLASS_HID_35617 = 0x35617,
-	BNXT_ULP_CLASS_HID_3846b = 0x3846b,
-	BNXT_ULP_CLASS_HID_20b8b = 0x20b8b,
-	BNXT_ULP_CLASS_HID_2968b = 0x2968b,
-	BNXT_ULP_CLASS_HID_3218b = 0x3218b,
-	BNXT_ULP_CLASS_HID_3ac8b = 0x3ac8b,
-	BNXT_ULP_CLASS_HID_25567 = 0x25567,
-	BNXT_ULP_CLASS_HID_283bb = 0x283bb,
-	BNXT_ULP_CLASS_HID_30ebb = 0x30ebb,
-	BNXT_ULP_CLASS_HID_399bb = 0x399bb,
-	BNXT_ULP_CLASS_HID_250bb = 0x250bb,
-	BNXT_ULP_CLASS_HID_2dbbb = 0x2dbbb,
-	BNXT_ULP_CLASS_HID_3098f = 0x3098f,
-	BNXT_ULP_CLASS_HID_3948f = 0x3948f,
-	BNXT_ULP_CLASS_HID_206df = 0x206df,
-	BNXT_ULP_CLASS_HID_291df = 0x291df,
-	BNXT_ULP_CLASS_HID_31cdf = 0x31cdf,
-	BNXT_ULP_CLASS_HID_3a7df = 0x3a7df,
-	BNXT_ULP_CLASS_HID_22f7f = 0x22f7f,
-	BNXT_ULP_CLASS_HID_2ba7f = 0x2ba7f,
-	BNXT_ULP_CLASS_HID_3457f = 0x3457f,
-	BNXT_ULP_CLASS_HID_3d07f = 0x3d07f,
-	BNXT_ULP_CLASS_HID_21c2f = 0x21c2f,
-	BNXT_ULP_CLASS_HID_2a72f = 0x2a72f,
-	BNXT_ULP_CLASS_HID_3322f = 0x3322f,
-	BNXT_ULP_CLASS_HID_3bd2f = 0x3bd2f,
-	BNXT_ULP_CLASS_HID_21763 = 0x21763,
-	BNXT_ULP_CLASS_HID_2a263 = 0x2a263,
-	BNXT_ULP_CLASS_HID_32d63 = 0x32d63,
-	BNXT_ULP_CLASS_HID_3b863 = 0x3b863,
-	BNXT_ULP_CLASS_HID_22ab3 = 0x22ab3,
-	BNXT_ULP_CLASS_HID_2b5b3 = 0x2b5b3,
-	BNXT_ULP_CLASS_HID_340b3 = 0x340b3,
-	BNXT_ULP_CLASS_HID_3cbb3 = 0x3cbb3,
-	BNXT_ULP_CLASS_HID_252d3 = 0x252d3,
-	BNXT_ULP_CLASS_HID_28127 = 0x28127,
-	BNXT_ULP_CLASS_HID_30c27 = 0x30c27,
-	BNXT_ULP_CLASS_HID_39727 = 0x39727,
-	BNXT_ULP_CLASS_HID_23f83 = 0x23f83,
-	BNXT_ULP_CLASS_HID_2ca83 = 0x2ca83,
-	BNXT_ULP_CLASS_HID_35583 = 0x35583,
-	BNXT_ULP_CLASS_HID_383d7 = 0x383d7,
-	BNXT_ULP_CLASS_HID_23ad7 = 0x23ad7,
-	BNXT_ULP_CLASS_HID_2c5d7 = 0x2c5d7,
-	BNXT_ULP_CLASS_HID_350d7 = 0x350d7,
-	BNXT_ULP_CLASS_HID_3dbd7 = 0x3dbd7,
-	BNXT_ULP_CLASS_HID_24e27 = 0x24e27,
-	BNXT_ULP_CLASS_HID_2d927 = 0x2d927,
-	BNXT_ULP_CLASS_HID_3077b = 0x3077b,
-	BNXT_ULP_CLASS_HID_3927b = 0x3927b,
-	BNXT_ULP_CLASS_HID_2320f = 0x2320f,
-	BNXT_ULP_CLASS_HID_2bd0f = 0x2bd0f,
-	BNXT_ULP_CLASS_HID_3480f = 0x3480f,
-	BNXT_ULP_CLASS_HID_3d30f = 0x3d30f,
-	BNXT_ULP_CLASS_HID_21f3f = 0x21f3f,
-	BNXT_ULP_CLASS_HID_2aa3f = 0x2aa3f,
-	BNXT_ULP_CLASS_HID_3353f = 0x3353f,
-	BNXT_ULP_CLASS_HID_3c03f = 0x3c03f,
-	BNXT_ULP_CLASS_HID_21a73 = 0x21a73,
-	BNXT_ULP_CLASS_HID_2a573 = 0x2a573,
-	BNXT_ULP_CLASS_HID_33073 = 0x33073,
-	BNXT_ULP_CLASS_HID_3bb73 = 0x3bb73,
-	BNXT_ULP_CLASS_HID_22d43 = 0x22d43,
-	BNXT_ULP_CLASS_HID_2b843 = 0x2b843,
-	BNXT_ULP_CLASS_HID_34343 = 0x34343,
-	BNXT_ULP_CLASS_HID_3ce43 = 0x3ce43,
-	BNXT_ULP_CLASS_HID_255e3 = 0x255e3,
-	BNXT_ULP_CLASS_HID_28437 = 0x28437,
-	BNXT_ULP_CLASS_HID_30f37 = 0x30f37,
-	BNXT_ULP_CLASS_HID_39a37 = 0x39a37,
-	BNXT_ULP_CLASS_HID_24293 = 0x24293,
-	BNXT_ULP_CLASS_HID_2cd93 = 0x2cd93,
-	BNXT_ULP_CLASS_HID_35893 = 0x35893,
-	BNXT_ULP_CLASS_HID_386e7 = 0x386e7,
-	BNXT_ULP_CLASS_HID_23de7 = 0x23de7,
-	BNXT_ULP_CLASS_HID_2c8e7 = 0x2c8e7,
-	BNXT_ULP_CLASS_HID_353e7 = 0x353e7,
-	BNXT_ULP_CLASS_HID_3823b = 0x3823b,
-	BNXT_ULP_CLASS_HID_25137 = 0x25137,
-	BNXT_ULP_CLASS_HID_2dc37 = 0x2dc37,
-	BNXT_ULP_CLASS_HID_30a0b = 0x30a0b,
-	BNXT_ULP_CLASS_HID_3950b = 0x3950b,
-	BNXT_ULP_CLASS_HID_22c33 = 0x22c33,
-	BNXT_ULP_CLASS_HID_2b733 = 0x2b733,
-	BNXT_ULP_CLASS_HID_34233 = 0x34233,
-	BNXT_ULP_CLASS_HID_3cd33 = 0x3cd33,
-	BNXT_ULP_CLASS_HID_218e3 = 0x218e3,
-	BNXT_ULP_CLASS_HID_2a3e3 = 0x2a3e3,
-	BNXT_ULP_CLASS_HID_32ee3 = 0x32ee3,
-	BNXT_ULP_CLASS_HID_3b9e3 = 0x3b9e3,
-	BNXT_ULP_CLASS_HID_21437 = 0x21437,
-	BNXT_ULP_CLASS_HID_29f37 = 0x29f37,
-	BNXT_ULP_CLASS_HID_32a37 = 0x32a37,
-	BNXT_ULP_CLASS_HID_3b537 = 0x3b537,
-	BNXT_ULP_CLASS_HID_22707 = 0x22707,
-	BNXT_ULP_CLASS_HID_2b207 = 0x2b207,
-	BNXT_ULP_CLASS_HID_33d07 = 0x33d07,
-	BNXT_ULP_CLASS_HID_3c807 = 0x3c807,
-	BNXT_ULP_CLASS_HID_24fa7 = 0x24fa7,
-	BNXT_ULP_CLASS_HID_2daa7 = 0x2daa7,
-	BNXT_ULP_CLASS_HID_308fb = 0x308fb,
-	BNXT_ULP_CLASS_HID_393fb = 0x393fb,
-	BNXT_ULP_CLASS_HID_23c57 = 0x23c57,
-	BNXT_ULP_CLASS_HID_2c757 = 0x2c757,
-	BNXT_ULP_CLASS_HID_35257 = 0x35257,
-	BNXT_ULP_CLASS_HID_380ab = 0x380ab,
-	BNXT_ULP_CLASS_HID_237ab = 0x237ab,
-	BNXT_ULP_CLASS_HID_2c2ab = 0x2c2ab,
-	BNXT_ULP_CLASS_HID_34dab = 0x34dab,
-	BNXT_ULP_CLASS_HID_3d8ab = 0x3d8ab,
-	BNXT_ULP_CLASS_HID_24afb = 0x24afb,
-	BNXT_ULP_CLASS_HID_2d5fb = 0x2d5fb,
-	BNXT_ULP_CLASS_HID_303cf = 0x303cf,
-	BNXT_ULP_CLASS_HID_38ecf = 0x38ecf,
+	BNXT_ULP_CLASS_HID_2677 = 0x2677,
+	BNXT_ULP_CLASS_HID_2563 = 0x2563,
+	BNXT_ULP_CLASS_HID_2baf = 0x2baf,
+	BNXT_ULP_CLASS_HID_0fcf = 0x0fcf,
+	BNXT_ULP_CLASS_HID_160b = 0x160b,
+	BNXT_ULP_CLASS_HID_48f7 = 0x48f7,
+	BNXT_ULP_CLASS_HID_4f33 = 0x4f33,
+	BNXT_ULP_CLASS_HID_3353 = 0x3353,
+	BNXT_ULP_CLASS_HID_399f = 0x399f,
+	BNXT_ULP_CLASS_HID_42097 = 0x42097,
+	BNXT_ULP_CLASS_HID_426d3 = 0x426d3,
+	BNXT_ULP_CLASS_HID_40af3 = 0x40af3,
+	BNXT_ULP_CLASS_HID_4113f = 0x4113f,
+	BNXT_ULP_CLASS_HID_4443b = 0x4443b,
+	BNXT_ULP_CLASS_HID_44a67 = 0x44a67,
+	BNXT_ULP_CLASS_HID_42e87 = 0x42e87,
+	BNXT_ULP_CLASS_HID_434c3 = 0x434c3,
+	BNXT_ULP_CLASS_HID_2559 = 0x2559,
+	BNXT_ULP_CLASS_HID_2b95 = 0x2b95,
+	BNXT_ULP_CLASS_HID_45b1 = 0x45b1,
+	BNXT_ULP_CLASS_HID_4b8d = 0x4b8d,
+	BNXT_ULP_CLASS_HID_2541 = 0x2541,
+	BNXT_ULP_CLASS_HID_2b8d = 0x2b8d,
+	BNXT_ULP_CLASS_HID_5bfd = 0x5bfd,
+	BNXT_ULP_CLASS_HID_056d = 0x056d,
+	BNXT_ULP_CLASS_HID_2539 = 0x2539,
+	BNXT_ULP_CLASS_HID_2bf5 = 0x2bf5,
+	BNXT_ULP_CLASS_HID_45d1 = 0x45d1,
+	BNXT_ULP_CLASS_HID_4bed = 0x4bed,
+	BNXT_ULP_CLASS_HID_2521 = 0x2521,
+	BNXT_ULP_CLASS_HID_2bed = 0x2bed,
+	BNXT_ULP_CLASS_HID_5b9d = 0x5b9d,
+	BNXT_ULP_CLASS_HID_050d = 0x050d,
 	BNXT_ULP_CLASS_HID_255b = 0x255b,
 	BNXT_ULP_CLASS_HID_2b97 = 0x2b97,
-	BNXT_ULP_CLASS_HID_1847 = 0x1847,
-	BNXT_ULP_CLASS_HID_4f0b = 0x4f0b,
-	BNXT_ULP_CLASS_HID_3c3b = 0x3c3b,
+	BNXT_ULP_CLASS_HID_0ff7 = 0x0ff7,
 	BNXT_ULP_CLASS_HID_1633 = 0x1633,
-	BNXT_ULP_CLASS_HID_02e3 = 0x02e3,
-	BNXT_ULP_CLASS_HID_39a7 = 0x39a7,
-	BNXT_ULP_CLASS_HID_2657 = 0x2657,
-	BNXT_ULP_CLASS_HID_120b = 0x120b,
 	BNXT_ULP_CLASS_HID_48cf = 0x48cf,
-	BNXT_ULP_CLASS_HID_35ff = 0x35ff,
-	BNXT_ULP_CLASS_HID_0ff7 = 0x0ff7,
-	BNXT_ULP_CLASS_HID_5953 = 0x5953,
-	BNXT_ULP_CLASS_HID_336b = 0x336b,
-	BNXT_ULP_CLASS_HID_201b = 0x201b,
-	BNXT_ULP_CLASS_HID_257f7 = 0x257f7,
-	BNXT_ULP_CLASS_HID_2858b = 0x2858b,
-	BNXT_ULP_CLASS_HID_3108b = 0x3108b,
-	BNXT_ULP_CLASS_HID_39b8b = 0x39b8b,
-	BNXT_ULP_CLASS_HID_24427 = 0x24427,
-	BNXT_ULP_CLASS_HID_2cf27 = 0x2cf27,
-	BNXT_ULP_CLASS_HID_35a27 = 0x35a27,
-	BNXT_ULP_CLASS_HID_388fb = 0x388fb,
-	BNXT_ULP_CLASS_HID_23ffb = 0x23ffb,
-	BNXT_ULP_CLASS_HID_2cafb = 0x2cafb,
-	BNXT_ULP_CLASS_HID_355fb = 0x355fb,
-	BNXT_ULP_CLASS_HID_3838f = 0x3838f,
-	BNXT_ULP_CLASS_HID_2528b = 0x2528b,
-	BNXT_ULP_CLASS_HID_2815f = 0x2815f,
-	BNXT_ULP_CLASS_HID_30c5f = 0x30c5f,
-	BNXT_ULP_CLASS_HID_3975f = 0x3975f,
-	BNXT_ULP_CLASS_HID_21e3f = 0x21e3f,
-	BNXT_ULP_CLASS_HID_2a93f = 0x2a93f,
-	BNXT_ULP_CLASS_HID_3343f = 0x3343f,
-	BNXT_ULP_CLASS_HID_3bf3f = 0x3bf3f,
-	BNXT_ULP_CLASS_HID_20b6f = 0x20b6f,
-	BNXT_ULP_CLASS_HID_2966f = 0x2966f,
-	BNXT_ULP_CLASS_HID_3216f = 0x3216f,
-	BNXT_ULP_CLASS_HID_3ac6f = 0x3ac6f,
-	BNXT_ULP_CLASS_HID_20623 = 0x20623,
-	BNXT_ULP_CLASS_HID_29123 = 0x29123,
-	BNXT_ULP_CLASS_HID_31c23 = 0x31c23,
-	BNXT_ULP_CLASS_HID_3a723 = 0x3a723,
-	BNXT_ULP_CLASS_HID_219f3 = 0x219f3,
-	BNXT_ULP_CLASS_HID_2a4f3 = 0x2a4f3,
-	BNXT_ULP_CLASS_HID_32ff3 = 0x32ff3,
-	BNXT_ULP_CLASS_HID_3baf3 = 0x3baf3,
-	BNXT_ULP_CLASS_HID_24253 = 0x24253,
-	BNXT_ULP_CLASS_HID_2cd53 = 0x2cd53,
-	BNXT_ULP_CLASS_HID_35853 = 0x35853,
-	BNXT_ULP_CLASS_HID_38667 = 0x38667,
-	BNXT_ULP_CLASS_HID_22e83 = 0x22e83,
-	BNXT_ULP_CLASS_HID_2b983 = 0x2b983,
-	BNXT_ULP_CLASS_HID_34483 = 0x34483,
-	BNXT_ULP_CLASS_HID_3cf83 = 0x3cf83,
-	BNXT_ULP_CLASS_HID_22a57 = 0x22a57,
-	BNXT_ULP_CLASS_HID_2b557 = 0x2b557,
-	BNXT_ULP_CLASS_HID_34057 = 0x34057,
-	BNXT_ULP_CLASS_HID_3cb57 = 0x3cb57,
-	BNXT_ULP_CLASS_HID_23d67 = 0x23d67,
-	BNXT_ULP_CLASS_HID_2c867 = 0x2c867,
-	BNXT_ULP_CLASS_HID_35367 = 0x35367,
-	BNXT_ULP_CLASS_HID_3813b = 0x3813b,
-	BNXT_ULP_CLASS_HID_2089b = 0x2089b,
-	BNXT_ULP_CLASS_HID_2939b = 0x2939b,
-	BNXT_ULP_CLASS_HID_31e9b = 0x31e9b,
-	BNXT_ULP_CLASS_HID_3a99b = 0x3a99b,
-	BNXT_ULP_CLASS_HID_25237 = 0x25237,
-	BNXT_ULP_CLASS_HID_280cb = 0x280cb,
-	BNXT_ULP_CLASS_HID_30bcb = 0x30bcb,
-	BNXT_ULP_CLASS_HID_396cb = 0x396cb,
-	BNXT_ULP_CLASS_HID_24dcb = 0x24dcb,
-	BNXT_ULP_CLASS_HID_2d8cb = 0x2d8cb,
-	BNXT_ULP_CLASS_HID_3069f = 0x3069f,
-	BNXT_ULP_CLASS_HID_3919f = 0x3919f,
-	BNXT_ULP_CLASS_HID_203af = 0x203af,
-	BNXT_ULP_CLASS_HID_28eaf = 0x28eaf,
-	BNXT_ULP_CLASS_HID_319af = 0x319af,
-	BNXT_ULP_CLASS_HID_3a4af = 0x3a4af,
-	BNXT_ULP_CLASS_HID_2513b = 0x2513b,
-	BNXT_ULP_CLASS_HID_2dc3b = 0x2dc3b,
-	BNXT_ULP_CLASS_HID_30acf = 0x30acf,
-	BNXT_ULP_CLASS_HID_395cf = 0x395cf,
-	BNXT_ULP_CLASS_HID_23e6b = 0x23e6b,
-	BNXT_ULP_CLASS_HID_2c96b = 0x2c96b,
-	BNXT_ULP_CLASS_HID_3546b = 0x3546b,
-	BNXT_ULP_CLASS_HID_3823f = 0x3823f,
-	BNXT_ULP_CLASS_HID_2393f = 0x2393f,
-	BNXT_ULP_CLASS_HID_2c43f = 0x2c43f,
-	BNXT_ULP_CLASS_HID_34f3f = 0x34f3f,
-	BNXT_ULP_CLASS_HID_3da3f = 0x3da3f,
-	BNXT_ULP_CLASS_HID_24ccf = 0x24ccf,
-	BNXT_ULP_CLASS_HID_2d7cf = 0x2d7cf,
-	BNXT_ULP_CLASS_HID_30583 = 0x30583,
-	BNXT_ULP_CLASS_HID_39083 = 0x39083,
-	BNXT_ULP_CLASS_HID_21863 = 0x21863,
-	BNXT_ULP_CLASS_HID_2a363 = 0x2a363,
-	BNXT_ULP_CLASS_HID_32e63 = 0x32e63,
-	BNXT_ULP_CLASS_HID_3b963 = 0x3b963,
-	BNXT_ULP_CLASS_HID_20553 = 0x20553,
-	BNXT_ULP_CLASS_HID_29053 = 0x29053,
-	BNXT_ULP_CLASS_HID_31b53 = 0x31b53,
-	BNXT_ULP_CLASS_HID_3a653 = 0x3a653,
-	BNXT_ULP_CLASS_HID_20067 = 0x20067,
-	BNXT_ULP_CLASS_HID_28b67 = 0x28b67,
-	BNXT_ULP_CLASS_HID_31667 = 0x31667,
-	BNXT_ULP_CLASS_HID_3a167 = 0x3a167,
-	BNXT_ULP_CLASS_HID_21337 = 0x21337,
-	BNXT_ULP_CLASS_HID_29e37 = 0x29e37,
-	BNXT_ULP_CLASS_HID_32937 = 0x32937,
-	BNXT_ULP_CLASS_HID_3b437 = 0x3b437,
-	BNXT_ULP_CLASS_HID_23b97 = 0x23b97,
-	BNXT_ULP_CLASS_HID_2c697 = 0x2c697,
-	BNXT_ULP_CLASS_HID_35197 = 0x35197,
-	BNXT_ULP_CLASS_HID_3dc97 = 0x3dc97,
-	BNXT_ULP_CLASS_HID_228c7 = 0x228c7,
-	BNXT_ULP_CLASS_HID_2b3c7 = 0x2b3c7,
-	BNXT_ULP_CLASS_HID_33ec7 = 0x33ec7,
-	BNXT_ULP_CLASS_HID_3c9c7 = 0x3c9c7,
-	BNXT_ULP_CLASS_HID_2239b = 0x2239b,
-	BNXT_ULP_CLASS_HID_2ae9b = 0x2ae9b,
-	BNXT_ULP_CLASS_HID_3399b = 0x3399b,
-	BNXT_ULP_CLASS_HID_3c49b = 0x3c49b,
-	BNXT_ULP_CLASS_HID_236ab = 0x236ab,
-	BNXT_ULP_CLASS_HID_2c1ab = 0x2c1ab,
-	BNXT_ULP_CLASS_HID_34cab = 0x34cab,
-	BNXT_ULP_CLASS_HID_3d7ab = 0x3d7ab,
-	BNXT_ULP_CLASS_HID_202df = 0x202df,
-	BNXT_ULP_CLASS_HID_28ddf = 0x28ddf,
-	BNXT_ULP_CLASS_HID_318df = 0x318df,
-	BNXT_ULP_CLASS_HID_3a3df = 0x3a3df,
-	BNXT_ULP_CLASS_HID_24c7b = 0x24c7b,
-	BNXT_ULP_CLASS_HID_2d77b = 0x2d77b,
-	BNXT_ULP_CLASS_HID_3050f = 0x3050f,
-	BNXT_ULP_CLASS_HID_3900f = 0x3900f,
-	BNXT_ULP_CLASS_HID_2470f = 0x2470f,
-	BNXT_ULP_CLASS_HID_2d20f = 0x2d20f,
-	BNXT_ULP_CLASS_HID_300c3 = 0x300c3,
-	BNXT_ULP_CLASS_HID_38bc3 = 0x38bc3,
-	BNXT_ULP_CLASS_HID_25adf = 0x25adf,
-	BNXT_ULP_CLASS_HID_28893 = 0x28893,
-	BNXT_ULP_CLASS_HID_31393 = 0x31393,
-	BNXT_ULP_CLASS_HID_39e93 = 0x39e93,
-	BNXT_ULP_CLASS_HID_24b7f = 0x24b7f,
-	BNXT_ULP_CLASS_HID_2d67f = 0x2d67f,
-	BNXT_ULP_CLASS_HID_30433 = 0x30433,
-	BNXT_ULP_CLASS_HID_38f33 = 0x38f33,
-	BNXT_ULP_CLASS_HID_237af = 0x237af,
-	BNXT_ULP_CLASS_HID_2c2af = 0x2c2af,
-	BNXT_ULP_CLASS_HID_34daf = 0x34daf,
-	BNXT_ULP_CLASS_HID_3d8af = 0x3d8af,
-	BNXT_ULP_CLASS_HID_23363 = 0x23363,
-	BNXT_ULP_CLASS_HID_2be63 = 0x2be63,
-	BNXT_ULP_CLASS_HID_34963 = 0x34963,
-	BNXT_ULP_CLASS_HID_3d463 = 0x3d463,
-	BNXT_ULP_CLASS_HID_24633 = 0x24633,
-	BNXT_ULP_CLASS_HID_2d133 = 0x2d133,
-	BNXT_ULP_CLASS_HID_35c33 = 0x35c33,
-	BNXT_ULP_CLASS_HID_38ac7 = 0x38ac7,
-	BNXT_ULP_CLASS_HID_211a7 = 0x211a7,
-	BNXT_ULP_CLASS_HID_29ca7 = 0x29ca7,
-	BNXT_ULP_CLASS_HID_327a7 = 0x327a7,
-	BNXT_ULP_CLASS_HID_3b2a7 = 0x3b2a7,
-	BNXT_ULP_CLASS_HID_25bc3 = 0x25bc3,
-	BNXT_ULP_CLASS_HID_28997 = 0x28997,
-	BNXT_ULP_CLASS_HID_31497 = 0x31497,
-	BNXT_ULP_CLASS_HID_39f97 = 0x39f97,
-	BNXT_ULP_CLASS_HID_25697 = 0x25697,
-	BNXT_ULP_CLASS_HID_284ab = 0x284ab,
-	BNXT_ULP_CLASS_HID_30fab = 0x30fab,
-	BNXT_ULP_CLASS_HID_39aab = 0x39aab,
-	BNXT_ULP_CLASS_HID_20d7b = 0x20d7b,
-	BNXT_ULP_CLASS_HID_2987b = 0x2987b,
-	BNXT_ULP_CLASS_HID_3237b = 0x3237b,
-	BNXT_ULP_CLASS_HID_3ae7b = 0x3ae7b,
-	BNXT_ULP_CLASS_HID_235db = 0x235db,
-	BNXT_ULP_CLASS_HID_2c0db = 0x2c0db,
-	BNXT_ULP_CLASS_HID_34bdb = 0x34bdb,
-	BNXT_ULP_CLASS_HID_3d6db = 0x3d6db,
-	BNXT_ULP_CLASS_HID_2220b = 0x2220b,
-	BNXT_ULP_CLASS_HID_2ad0b = 0x2ad0b,
-	BNXT_ULP_CLASS_HID_3380b = 0x3380b,
-	BNXT_ULP_CLASS_HID_3c30b = 0x3c30b,
-	BNXT_ULP_CLASS_HID_21ddf = 0x21ddf,
-	BNXT_ULP_CLASS_HID_2a8df = 0x2a8df,
-	BNXT_ULP_CLASS_HID_333df = 0x333df,
-	BNXT_ULP_CLASS_HID_3bedf = 0x3bedf,
-	BNXT_ULP_CLASS_HID_230ef = 0x230ef,
-	BNXT_ULP_CLASS_HID_2bbef = 0x2bbef,
-	BNXT_ULP_CLASS_HID_346ef = 0x346ef,
-	BNXT_ULP_CLASS_HID_3d1ef = 0x3d1ef,
-	BNXT_ULP_CLASS_HID_2594f = 0x2594f,
-	BNXT_ULP_CLASS_HID_28703 = 0x28703,
-	BNXT_ULP_CLASS_HID_31203 = 0x31203,
-	BNXT_ULP_CLASS_HID_39d03 = 0x39d03,
-	BNXT_ULP_CLASS_HID_245bf = 0x245bf,
-	BNXT_ULP_CLASS_HID_2d0bf = 0x2d0bf,
-	BNXT_ULP_CLASS_HID_35bbf = 0x35bbf,
-	BNXT_ULP_CLASS_HID_38a73 = 0x38a73,
-	BNXT_ULP_CLASS_HID_24173 = 0x24173,
-	BNXT_ULP_CLASS_HID_2cc73 = 0x2cc73,
-	BNXT_ULP_CLASS_HID_35773 = 0x35773,
-	BNXT_ULP_CLASS_HID_38507 = 0x38507,
-	BNXT_ULP_CLASS_HID_25403 = 0x25403,
-	BNXT_ULP_CLASS_HID_282d7 = 0x282d7,
-	BNXT_ULP_CLASS_HID_30dd7 = 0x30dd7,
-	BNXT_ULP_CLASS_HID_398d7 = 0x398d7,
-	BNXT_ULP_CLASS_HID_244a3 = 0x244a3,
-	BNXT_ULP_CLASS_HID_2cfa3 = 0x2cfa3,
-	BNXT_ULP_CLASS_HID_35aa3 = 0x35aa3,
-	BNXT_ULP_CLASS_HID_38977 = 0x38977,
-	BNXT_ULP_CLASS_HID_23193 = 0x23193,
-	BNXT_ULP_CLASS_HID_2bc93 = 0x2bc93,
-	BNXT_ULP_CLASS_HID_34793 = 0x34793,
-	BNXT_ULP_CLASS_HID_3d293 = 0x3d293,
-	BNXT_ULP_CLASS_HID_22ca7 = 0x22ca7,
-	BNXT_ULP_CLASS_HID_2b7a7 = 0x2b7a7,
-	BNXT_ULP_CLASS_HID_342a7 = 0x342a7,
-	BNXT_ULP_CLASS_HID_3cda7 = 0x3cda7,
-	BNXT_ULP_CLASS_HID_24077 = 0x24077,
-	BNXT_ULP_CLASS_HID_2cb77 = 0x2cb77,
-	BNXT_ULP_CLASS_HID_35677 = 0x35677,
-	BNXT_ULP_CLASS_HID_3840b = 0x3840b,
-	BNXT_ULP_CLASS_HID_20beb = 0x20beb,
-	BNXT_ULP_CLASS_HID_296eb = 0x296eb,
-	BNXT_ULP_CLASS_HID_321eb = 0x321eb,
-	BNXT_ULP_CLASS_HID_3aceb = 0x3aceb,
-	BNXT_ULP_CLASS_HID_25507 = 0x25507,
-	BNXT_ULP_CLASS_HID_283db = 0x283db,
-	BNXT_ULP_CLASS_HID_30edb = 0x30edb,
-	BNXT_ULP_CLASS_HID_399db = 0x399db,
-	BNXT_ULP_CLASS_HID_250db = 0x250db,
-	BNXT_ULP_CLASS_HID_2dbdb = 0x2dbdb,
-	BNXT_ULP_CLASS_HID_309ef = 0x309ef,
-	BNXT_ULP_CLASS_HID_394ef = 0x394ef,
-	BNXT_ULP_CLASS_HID_206bf = 0x206bf,
-	BNXT_ULP_CLASS_HID_291bf = 0x291bf,
-	BNXT_ULP_CLASS_HID_31cbf = 0x31cbf,
-	BNXT_ULP_CLASS_HID_3a7bf = 0x3a7bf,
-	BNXT_ULP_CLASS_HID_22f1f = 0x22f1f,
-	BNXT_ULP_CLASS_HID_2ba1f = 0x2ba1f,
-	BNXT_ULP_CLASS_HID_3451f = 0x3451f,
-	BNXT_ULP_CLASS_HID_3d01f = 0x3d01f,
-	BNXT_ULP_CLASS_HID_21c4f = 0x21c4f,
-	BNXT_ULP_CLASS_HID_2a74f = 0x2a74f,
-	BNXT_ULP_CLASS_HID_3324f = 0x3324f,
-	BNXT_ULP_CLASS_HID_3bd4f = 0x3bd4f,
-	BNXT_ULP_CLASS_HID_21703 = 0x21703,
-	BNXT_ULP_CLASS_HID_2a203 = 0x2a203,
-	BNXT_ULP_CLASS_HID_32d03 = 0x32d03,
-	BNXT_ULP_CLASS_HID_3b803 = 0x3b803,
-	BNXT_ULP_CLASS_HID_22ad3 = 0x22ad3,
-	BNXT_ULP_CLASS_HID_2b5d3 = 0x2b5d3,
-	BNXT_ULP_CLASS_HID_340d3 = 0x340d3,
-	BNXT_ULP_CLASS_HID_3cbd3 = 0x3cbd3,
-	BNXT_ULP_CLASS_HID_252b3 = 0x252b3,
-	BNXT_ULP_CLASS_HID_28147 = 0x28147,
-	BNXT_ULP_CLASS_HID_30c47 = 0x30c47,
-	BNXT_ULP_CLASS_HID_39747 = 0x39747,
-	BNXT_ULP_CLASS_HID_23fe3 = 0x23fe3,
-	BNXT_ULP_CLASS_HID_2cae3 = 0x2cae3,
-	BNXT_ULP_CLASS_HID_355e3 = 0x355e3,
-	BNXT_ULP_CLASS_HID_383b7 = 0x383b7,
-	BNXT_ULP_CLASS_HID_23ab7 = 0x23ab7,
-	BNXT_ULP_CLASS_HID_2c5b7 = 0x2c5b7,
-	BNXT_ULP_CLASS_HID_350b7 = 0x350b7,
-	BNXT_ULP_CLASS_HID_3dbb7 = 0x3dbb7,
-	BNXT_ULP_CLASS_HID_24e47 = 0x24e47,
-	BNXT_ULP_CLASS_HID_2d947 = 0x2d947,
-	BNXT_ULP_CLASS_HID_3071b = 0x3071b,
-	BNXT_ULP_CLASS_HID_3921b = 0x3921b,
-	BNXT_ULP_CLASS_HID_2326f = 0x2326f,
-	BNXT_ULP_CLASS_HID_2bd6f = 0x2bd6f,
-	BNXT_ULP_CLASS_HID_3486f = 0x3486f,
-	BNXT_ULP_CLASS_HID_3d36f = 0x3d36f,
-	BNXT_ULP_CLASS_HID_21f5f = 0x21f5f,
-	BNXT_ULP_CLASS_HID_2aa5f = 0x2aa5f,
-	BNXT_ULP_CLASS_HID_3355f = 0x3355f,
-	BNXT_ULP_CLASS_HID_3c05f = 0x3c05f,
-	BNXT_ULP_CLASS_HID_21a13 = 0x21a13,
-	BNXT_ULP_CLASS_HID_2a513 = 0x2a513,
-	BNXT_ULP_CLASS_HID_33013 = 0x33013,
-	BNXT_ULP_CLASS_HID_3bb13 = 0x3bb13,
-	BNXT_ULP_CLASS_HID_22d23 = 0x22d23,
-	BNXT_ULP_CLASS_HID_2b823 = 0x2b823,
-	BNXT_ULP_CLASS_HID_34323 = 0x34323,
-	BNXT_ULP_CLASS_HID_3ce23 = 0x3ce23,
-	BNXT_ULP_CLASS_HID_25583 = 0x25583,
-	BNXT_ULP_CLASS_HID_28457 = 0x28457,
-	BNXT_ULP_CLASS_HID_30f57 = 0x30f57,
-	BNXT_ULP_CLASS_HID_39a57 = 0x39a57,
-	BNXT_ULP_CLASS_HID_242f3 = 0x242f3,
-	BNXT_ULP_CLASS_HID_2cdf3 = 0x2cdf3,
-	BNXT_ULP_CLASS_HID_358f3 = 0x358f3,
-	BNXT_ULP_CLASS_HID_38687 = 0x38687,
-	BNXT_ULP_CLASS_HID_23d87 = 0x23d87,
-	BNXT_ULP_CLASS_HID_2c887 = 0x2c887,
-	BNXT_ULP_CLASS_HID_35387 = 0x35387,
-	BNXT_ULP_CLASS_HID_3825b = 0x3825b,
-	BNXT_ULP_CLASS_HID_25157 = 0x25157,
-	BNXT_ULP_CLASS_HID_2dc57 = 0x2dc57,
-	BNXT_ULP_CLASS_HID_30a6b = 0x30a6b,
-	BNXT_ULP_CLASS_HID_3956b = 0x3956b,
-	BNXT_ULP_CLASS_HID_22c53 = 0x22c53,
-	BNXT_ULP_CLASS_HID_2b753 = 0x2b753,
-	BNXT_ULP_CLASS_HID_34253 = 0x34253,
-	BNXT_ULP_CLASS_HID_3cd53 = 0x3cd53,
-	BNXT_ULP_CLASS_HID_21883 = 0x21883,
-	BNXT_ULP_CLASS_HID_2a383 = 0x2a383,
-	BNXT_ULP_CLASS_HID_32e83 = 0x32e83,
-	BNXT_ULP_CLASS_HID_3b983 = 0x3b983,
-	BNXT_ULP_CLASS_HID_21457 = 0x21457,
-	BNXT_ULP_CLASS_HID_29f57 = 0x29f57,
-	BNXT_ULP_CLASS_HID_32a57 = 0x32a57,
-	BNXT_ULP_CLASS_HID_3b557 = 0x3b557,
-	BNXT_ULP_CLASS_HID_22767 = 0x22767,
-	BNXT_ULP_CLASS_HID_2b267 = 0x2b267,
-	BNXT_ULP_CLASS_HID_33d67 = 0x33d67,
-	BNXT_ULP_CLASS_HID_3c867 = 0x3c867,
-	BNXT_ULP_CLASS_HID_24fc7 = 0x24fc7,
-	BNXT_ULP_CLASS_HID_2dac7 = 0x2dac7,
-	BNXT_ULP_CLASS_HID_3089b = 0x3089b,
-	BNXT_ULP_CLASS_HID_3939b = 0x3939b,
-	BNXT_ULP_CLASS_HID_23c37 = 0x23c37,
-	BNXT_ULP_CLASS_HID_2c737 = 0x2c737,
-	BNXT_ULP_CLASS_HID_35237 = 0x35237,
-	BNXT_ULP_CLASS_HID_380cb = 0x380cb,
-	BNXT_ULP_CLASS_HID_237cb = 0x237cb,
-	BNXT_ULP_CLASS_HID_2c2cb = 0x2c2cb,
-	BNXT_ULP_CLASS_HID_34dcb = 0x34dcb,
-	BNXT_ULP_CLASS_HID_3d8cb = 0x3d8cb,
-	BNXT_ULP_CLASS_HID_24a9b = 0x24a9b,
-	BNXT_ULP_CLASS_HID_2d59b = 0x2d59b,
-	BNXT_ULP_CLASS_HID_303af = 0x303af,
-	BNXT_ULP_CLASS_HID_38eaf = 0x38eaf,
-	BNXT_ULP_CLASS_HID_253b = 0x253b,
-	BNXT_ULP_CLASS_HID_2bf7 = 0x2bf7,
-	BNXT_ULP_CLASS_HID_1827 = 0x1827,
-	BNXT_ULP_CLASS_HID_4f6b = 0x4f6b,
-	BNXT_ULP_CLASS_HID_3c5b = 0x3c5b,
-	BNXT_ULP_CLASS_HID_1653 = 0x1653,
-	BNXT_ULP_CLASS_HID_0283 = 0x0283,
-	BNXT_ULP_CLASS_HID_39c7 = 0x39c7,
-	BNXT_ULP_CLASS_HID_2637 = 0x2637,
-	BNXT_ULP_CLASS_HID_126b = 0x126b,
-	BNXT_ULP_CLASS_HID_48af = 0x48af,
-	BNXT_ULP_CLASS_HID_359f = 0x359f,
-	BNXT_ULP_CLASS_HID_0f97 = 0x0f97,
-	BNXT_ULP_CLASS_HID_5933 = 0x5933,
-	BNXT_ULP_CLASS_HID_330b = 0x330b,
-	BNXT_ULP_CLASS_HID_207b = 0x207b,
-	BNXT_ULP_CLASS_HID_374e = 0x374e,
-	BNXT_ULP_CLASS_HID_11ee = 0x11ee,
-	BNXT_ULP_CLASS_HID_423a = 0x423a,
-	BNXT_ULP_CLASS_HID_0cd6 = 0x0cd6,
-	BNXT_ULP_CLASS_HID_310a = 0x310a,
-	BNXT_ULP_CLASS_HID_469e = 0x469e,
-	BNXT_ULP_CLASS_HID_5ce6 = 0x5ce6,
-	BNXT_ULP_CLASS_HID_0692 = 0x0692,
-	BNXT_ULP_CLASS_HID_1c7e = 0x1c7e,
-	BNXT_ULP_CLASS_HID_55c2 = 0x55c2,
-	BNXT_ULP_CLASS_HID_2b2a = 0x2b2a,
-	BNXT_ULP_CLASS_HID_15c6 = 0x15c6,
-	BNXT_ULP_CLASS_HID_163a = 0x163a,
-	BNXT_ULP_CLASS_HID_2f8e = 0x2f8e,
-	BNXT_ULP_CLASS_HID_2516 = 0x2516,
-	BNXT_ULP_CLASS_HID_4b76 = 0x4b76,
-	BNXT_ULP_CLASS_HID_10e6 = 0x10e6,
-	BNXT_ULP_CLASS_HID_264a = 0x264a,
-	BNXT_ULP_CLASS_HID_3fd2 = 0x3fd2,
-	BNXT_ULP_CLASS_HID_4532 = 0x4532,
-	BNXT_ULP_CLASS_HID_4996 = 0x4996,
-	BNXT_ULP_CLASS_HID_2036 = 0x2036,
-	BNXT_ULP_CLASS_HID_399e = 0x399e,
-	BNXT_ULP_CLASS_HID_5ffe = 0x5ffe,
-	BNXT_ULP_CLASS_HID_34fe = 0x34fe,
-	BNXT_ULP_CLASS_HID_3a32 = 0x3a32,
-	BNXT_ULP_CLASS_HID_14d2 = 0x14d2,
-	BNXT_ULP_CLASS_HID_4a42 = 0x4a42,
-	BNXT_ULP_CLASS_HID_376e = 0x376e,
-	BNXT_ULP_CLASS_HID_12d6e = 0x12d6e,
-	BNXT_ULP_CLASS_HID_2436e = 0x2436e,
-	BNXT_ULP_CLASS_HID_31dba = 0x31dba,
-	BNXT_ULP_CLASS_HID_11ce = 0x11ce,
-	BNXT_ULP_CLASS_HID_107ce = 0x107ce,
-	BNXT_ULP_CLASS_HID_23dce = 0x23dce,
-	BNXT_ULP_CLASS_HID_353ce = 0x353ce,
-	BNXT_ULP_CLASS_HID_421a = 0x421a,
-	BNXT_ULP_CLASS_HID_11d56 = 0x11d56,
-	BNXT_ULP_CLASS_HID_23356 = 0x23356,
-	BNXT_ULP_CLASS_HID_32956 = 0x32956,
-	BNXT_ULP_CLASS_HID_0cf6 = 0x0cf6,
-	BNXT_ULP_CLASS_HID_122f6 = 0x122f6,
-	BNXT_ULP_CLASS_HID_258f6 = 0x258f6,
-	BNXT_ULP_CLASS_HID_313c2 = 0x313c2,
-	BNXT_ULP_CLASS_HID_312a = 0x312a,
-	BNXT_ULP_CLASS_HID_1272a = 0x1272a,
-	BNXT_ULP_CLASS_HID_25d2a = 0x25d2a,
-	BNXT_ULP_CLASS_HID_31466 = 0x31466,
-	BNXT_ULP_CLASS_HID_46be = 0x46be,
-	BNXT_ULP_CLASS_HID_1018a = 0x1018a,
-	BNXT_ULP_CLASS_HID_2378a = 0x2378a,
-	BNXT_ULP_CLASS_HID_32d8a = 0x32d8a,
-	BNXT_ULP_CLASS_HID_5cc6 = 0x5cc6,
-	BNXT_ULP_CLASS_HID_11712 = 0x11712,
-	BNXT_ULP_CLASS_HID_20d12 = 0x20d12,
-	BNXT_ULP_CLASS_HID_32312 = 0x32312,
-	BNXT_ULP_CLASS_HID_06b2 = 0x06b2,
-	BNXT_ULP_CLASS_HID_13cb2 = 0x13cb2,
-	BNXT_ULP_CLASS_HID_252b2 = 0x252b2,
-	BNXT_ULP_CLASS_HID_348b2 = 0x348b2,
-	BNXT_ULP_CLASS_HID_1c5e = 0x1c5e,
-	BNXT_ULP_CLASS_HID_1325e = 0x1325e,
-	BNXT_ULP_CLASS_HID_2285e = 0x2285e,
-	BNXT_ULP_CLASS_HID_35e5e = 0x35e5e,
-	BNXT_ULP_CLASS_HID_55e2 = 0x55e2,
-	BNXT_ULP_CLASS_HID_14be2 = 0x14be2,
-	BNXT_ULP_CLASS_HID_2023e = 0x2023e,
-	BNXT_ULP_CLASS_HID_3383e = 0x3383e,
-	BNXT_ULP_CLASS_HID_2b0a = 0x2b0a,
-	BNXT_ULP_CLASS_HID_1410a = 0x1410a,
-	BNXT_ULP_CLASS_HID_21846 = 0x21846,
-	BNXT_ULP_CLASS_HID_30e46 = 0x30e46,
-	BNXT_ULP_CLASS_HID_15e6 = 0x15e6,
-	BNXT_ULP_CLASS_HID_10be6 = 0x10be6,
-	BNXT_ULP_CLASS_HID_221e6 = 0x221e6,
-	BNXT_ULP_CLASS_HID_357e6 = 0x357e6,
-	BNXT_ULP_CLASS_HID_161a = 0x161a,
-	BNXT_ULP_CLASS_HID_10c1a = 0x10c1a,
-	BNXT_ULP_CLASS_HID_2221a = 0x2221a,
-	BNXT_ULP_CLASS_HID_3581a = 0x3581a,
-	BNXT_ULP_CLASS_HID_2fae = 0x2fae,
-	BNXT_ULP_CLASS_HID_145ae = 0x145ae,
-	BNXT_ULP_CLASS_HID_21cfa = 0x21cfa,
-	BNXT_ULP_CLASS_HID_332fa = 0x332fa,
-	BNXT_ULP_CLASS_HID_2536 = 0x2536,
-	BNXT_ULP_CLASS_HID_15b36 = 0x15b36,
-	BNXT_ULP_CLASS_HID_21202 = 0x21202,
-	BNXT_ULP_CLASS_HID_30802 = 0x30802,
-	BNXT_ULP_CLASS_HID_4b56 = 0x4b56,
-	BNXT_ULP_CLASS_HID_105a2 = 0x105a2,
-	BNXT_ULP_CLASS_HID_23ba2 = 0x23ba2,
-	BNXT_ULP_CLASS_HID_351a2 = 0x351a2,
-	BNXT_ULP_CLASS_HID_10c6 = 0x10c6,
-	BNXT_ULP_CLASS_HID_106c6 = 0x106c6,
-	BNXT_ULP_CLASS_HID_23cc6 = 0x23cc6,
-	BNXT_ULP_CLASS_HID_352c6 = 0x352c6,
-	BNXT_ULP_CLASS_HID_266a = 0x266a,
-	BNXT_ULP_CLASS_HID_15c6a = 0x15c6a,
-	BNXT_ULP_CLASS_HID_216a6 = 0x216a6,
-	BNXT_ULP_CLASS_HID_30ca6 = 0x30ca6,
-	BNXT_ULP_CLASS_HID_3ff2 = 0x3ff2,
-	BNXT_ULP_CLASS_HID_155f2 = 0x155f2,
-	BNXT_ULP_CLASS_HID_24bf2 = 0x24bf2,
-	BNXT_ULP_CLASS_HID_302ce = 0x302ce,
-	BNXT_ULP_CLASS_HID_4512 = 0x4512,
-	BNXT_ULP_CLASS_HID_11c6e = 0x11c6e,
-	BNXT_ULP_CLASS_HID_2326e = 0x2326e,
-	BNXT_ULP_CLASS_HID_3286e = 0x3286e,
-	BNXT_ULP_CLASS_HID_49b6 = 0x49b6,
-	BNXT_ULP_CLASS_HID_10082 = 0x10082,
-	BNXT_ULP_CLASS_HID_23682 = 0x23682,
-	BNXT_ULP_CLASS_HID_32c82 = 0x32c82,
-	BNXT_ULP_CLASS_HID_2016 = 0x2016,
-	BNXT_ULP_CLASS_HID_15616 = 0x15616,
-	BNXT_ULP_CLASS_HID_21162 = 0x21162,
-	BNXT_ULP_CLASS_HID_30762 = 0x30762,
-	BNXT_ULP_CLASS_HID_39be = 0x39be,
-	BNXT_ULP_CLASS_HID_12fbe = 0x12fbe,
-	BNXT_ULP_CLASS_HID_245be = 0x245be,
-	BNXT_ULP_CLASS_HID_31c8a = 0x31c8a,
-	BNXT_ULP_CLASS_HID_5fde = 0x5fde,
-	BNXT_ULP_CLASS_HID_1162a = 0x1162a,
-	BNXT_ULP_CLASS_HID_20c2a = 0x20c2a,
-	BNXT_ULP_CLASS_HID_3222a = 0x3222a,
-	BNXT_ULP_CLASS_HID_34de = 0x34de,
-	BNXT_ULP_CLASS_HID_3a12 = 0x3a12,
-	BNXT_ULP_CLASS_HID_14f2 = 0x14f2,
-	BNXT_ULP_CLASS_HID_4a62 = 0x4a62,
-	BNXT_ULP_CLASS_HID_370e = 0x370e,
-	BNXT_ULP_CLASS_HID_12d0e = 0x12d0e,
-	BNXT_ULP_CLASS_HID_2430e = 0x2430e,
-	BNXT_ULP_CLASS_HID_31dda = 0x31dda,
-	BNXT_ULP_CLASS_HID_11ae = 0x11ae,
-	BNXT_ULP_CLASS_HID_107ae = 0x107ae,
-	BNXT_ULP_CLASS_HID_23dae = 0x23dae,
-	BNXT_ULP_CLASS_HID_353ae = 0x353ae,
-	BNXT_ULP_CLASS_HID_427a = 0x427a,
-	BNXT_ULP_CLASS_HID_11d36 = 0x11d36,
-	BNXT_ULP_CLASS_HID_23336 = 0x23336,
-	BNXT_ULP_CLASS_HID_32936 = 0x32936,
-	BNXT_ULP_CLASS_HID_0c96 = 0x0c96,
-	BNXT_ULP_CLASS_HID_12296 = 0x12296,
-	BNXT_ULP_CLASS_HID_25896 = 0x25896,
-	BNXT_ULP_CLASS_HID_313a2 = 0x313a2,
-	BNXT_ULP_CLASS_HID_314a = 0x314a,
-	BNXT_ULP_CLASS_HID_1274a = 0x1274a,
-	BNXT_ULP_CLASS_HID_25d4a = 0x25d4a,
-	BNXT_ULP_CLASS_HID_31406 = 0x31406,
-	BNXT_ULP_CLASS_HID_46de = 0x46de,
-	BNXT_ULP_CLASS_HID_101ea = 0x101ea,
-	BNXT_ULP_CLASS_HID_237ea = 0x237ea,
-	BNXT_ULP_CLASS_HID_32dea = 0x32dea,
-	BNXT_ULP_CLASS_HID_5ca6 = 0x5ca6,
-	BNXT_ULP_CLASS_HID_11772 = 0x11772,
-	BNXT_ULP_CLASS_HID_20d72 = 0x20d72,
-	BNXT_ULP_CLASS_HID_32372 = 0x32372,
-	BNXT_ULP_CLASS_HID_06d2 = 0x06d2,
-	BNXT_ULP_CLASS_HID_13cd2 = 0x13cd2,
-	BNXT_ULP_CLASS_HID_252d2 = 0x252d2,
-	BNXT_ULP_CLASS_HID_348d2 = 0x348d2,
-	BNXT_ULP_CLASS_HID_1c3e = 0x1c3e,
-	BNXT_ULP_CLASS_HID_1323e = 0x1323e,
-	BNXT_ULP_CLASS_HID_2283e = 0x2283e,
-	BNXT_ULP_CLASS_HID_35e3e = 0x35e3e,
-	BNXT_ULP_CLASS_HID_5582 = 0x5582,
-	BNXT_ULP_CLASS_HID_14b82 = 0x14b82,
-	BNXT_ULP_CLASS_HID_2025e = 0x2025e,
-	BNXT_ULP_CLASS_HID_3385e = 0x3385e,
-	BNXT_ULP_CLASS_HID_2b6a = 0x2b6a,
-	BNXT_ULP_CLASS_HID_1416a = 0x1416a,
-	BNXT_ULP_CLASS_HID_21826 = 0x21826,
-	BNXT_ULP_CLASS_HID_30e26 = 0x30e26,
-	BNXT_ULP_CLASS_HID_1586 = 0x1586,
-	BNXT_ULP_CLASS_HID_10b86 = 0x10b86,
-	BNXT_ULP_CLASS_HID_22186 = 0x22186,
-	BNXT_ULP_CLASS_HID_35786 = 0x35786,
-	BNXT_ULP_CLASS_HID_167a = 0x167a,
-	BNXT_ULP_CLASS_HID_10c7a = 0x10c7a,
-	BNXT_ULP_CLASS_HID_2227a = 0x2227a,
-	BNXT_ULP_CLASS_HID_3587a = 0x3587a,
-	BNXT_ULP_CLASS_HID_2fce = 0x2fce,
-	BNXT_ULP_CLASS_HID_145ce = 0x145ce,
-	BNXT_ULP_CLASS_HID_21c9a = 0x21c9a,
-	BNXT_ULP_CLASS_HID_3329a = 0x3329a,
-	BNXT_ULP_CLASS_HID_2556 = 0x2556,
-	BNXT_ULP_CLASS_HID_15b56 = 0x15b56,
-	BNXT_ULP_CLASS_HID_21262 = 0x21262,
-	BNXT_ULP_CLASS_HID_30862 = 0x30862,
-	BNXT_ULP_CLASS_HID_4b36 = 0x4b36,
-	BNXT_ULP_CLASS_HID_105c2 = 0x105c2,
-	BNXT_ULP_CLASS_HID_23bc2 = 0x23bc2,
-	BNXT_ULP_CLASS_HID_351c2 = 0x351c2,
-	BNXT_ULP_CLASS_HID_10a6 = 0x10a6,
-	BNXT_ULP_CLASS_HID_106a6 = 0x106a6,
-	BNXT_ULP_CLASS_HID_23ca6 = 0x23ca6,
-	BNXT_ULP_CLASS_HID_352a6 = 0x352a6,
-	BNXT_ULP_CLASS_HID_260a = 0x260a,
-	BNXT_ULP_CLASS_HID_15c0a = 0x15c0a,
-	BNXT_ULP_CLASS_HID_216c6 = 0x216c6,
-	BNXT_ULP_CLASS_HID_30cc6 = 0x30cc6,
-	BNXT_ULP_CLASS_HID_3f92 = 0x3f92,
-	BNXT_ULP_CLASS_HID_15592 = 0x15592,
-	BNXT_ULP_CLASS_HID_24b92 = 0x24b92,
-	BNXT_ULP_CLASS_HID_302ae = 0x302ae,
-	BNXT_ULP_CLASS_HID_4572 = 0x4572,
-	BNXT_ULP_CLASS_HID_11c0e = 0x11c0e,
-	BNXT_ULP_CLASS_HID_2320e = 0x2320e,
-	BNXT_ULP_CLASS_HID_3280e = 0x3280e,
-	BNXT_ULP_CLASS_HID_49d6 = 0x49d6,
-	BNXT_ULP_CLASS_HID_100e2 = 0x100e2,
-	BNXT_ULP_CLASS_HID_236e2 = 0x236e2,
-	BNXT_ULP_CLASS_HID_32ce2 = 0x32ce2,
-	BNXT_ULP_CLASS_HID_2076 = 0x2076,
-	BNXT_ULP_CLASS_HID_15676 = 0x15676,
-	BNXT_ULP_CLASS_HID_21102 = 0x21102,
-	BNXT_ULP_CLASS_HID_30702 = 0x30702,
-	BNXT_ULP_CLASS_HID_39de = 0x39de,
-	BNXT_ULP_CLASS_HID_12fde = 0x12fde,
-	BNXT_ULP_CLASS_HID_245de = 0x245de,
-	BNXT_ULP_CLASS_HID_31cea = 0x31cea,
-	BNXT_ULP_CLASS_HID_5fbe = 0x5fbe,
-	BNXT_ULP_CLASS_HID_1164a = 0x1164a,
-	BNXT_ULP_CLASS_HID_20c4a = 0x20c4a,
-	BNXT_ULP_CLASS_HID_3224a = 0x3224a,
-	BNXT_ULP_CLASS_HID_34be = 0x34be,
-	BNXT_ULP_CLASS_HID_3a72 = 0x3a72,
-	BNXT_ULP_CLASS_HID_1492 = 0x1492,
-	BNXT_ULP_CLASS_HID_4a02 = 0x4a02,
-	BNXT_ULP_CLASS_HID_09ea = 0x09ea,
-	BNXT_ULP_CLASS_HID_2912 = 0x2912,
-	BNXT_ULP_CLASS_HID_03b2 = 0x03b2,
-	BNXT_ULP_CLASS_HID_5f7e = 0x5f7e,
-	BNXT_ULP_CLASS_HID_03a6 = 0x03a6,
-	BNXT_ULP_CLASS_HID_23ce = 0x23ce,
-	BNXT_ULP_CLASS_HID_1a6e = 0x1a6e,
-	BNXT_ULP_CLASS_HID_593a = 0x593a,
-	BNXT_ULP_CLASS_HID_4dce = 0x4dce,
-	BNXT_ULP_CLASS_HID_0e02 = 0x0e02,
-	BNXT_ULP_CLASS_HID_4796 = 0x4796,
-	BNXT_ULP_CLASS_HID_246e = 0x246e,
-	BNXT_ULP_CLASS_HID_478a = 0x478a,
-	BNXT_ULP_CLASS_HID_08fe = 0x08fe,
-	BNXT_ULP_CLASS_HID_5e52 = 0x5e52,
-	BNXT_ULP_CLASS_HID_3e2a = 0x3e2a,
-	BNXT_ULP_CLASS_HID_5e46 = 0x5e46,
-	BNXT_ULP_CLASS_HID_02ba = 0x02ba,
-	BNXT_ULP_CLASS_HID_580e = 0x580e,
-	BNXT_ULP_CLASS_HID_38e6 = 0x38e6,
-	BNXT_ULP_CLASS_HID_5802 = 0x5802,
-	BNXT_ULP_CLASS_HID_1d76 = 0x1d76,
-	BNXT_ULP_CLASS_HID_52ca = 0x52ca,
-	BNXT_ULP_CLASS_HID_32a2 = 0x32a2,
-	BNXT_ULP_CLASS_HID_34f6 = 0x34f6,
-	BNXT_ULP_CLASS_HID_3a3a = 0x3a3a,
-	BNXT_ULP_CLASS_HID_5a22 = 0x5a22,
-	BNXT_ULP_CLASS_HID_541e = 0x541e,
-	BNXT_ULP_CLASS_HID_09ca = 0x09ca,
-	BNXT_ULP_CLASS_HID_0216 = 0x0216,
-	BNXT_ULP_CLASS_HID_1f62 = 0x1f62,
-	BNXT_ULP_CLASS_HID_1bae = 0x1bae,
-	BNXT_ULP_CLASS_HID_2932 = 0x2932,
-	BNXT_ULP_CLASS_HID_227e = 0x227e,
-	BNXT_ULP_CLASS_HID_3f4a = 0x3f4a,
-	BNXT_ULP_CLASS_HID_3b96 = 0x3b96,
-	BNXT_ULP_CLASS_HID_0392 = 0x0392,
-	BNXT_ULP_CLASS_HID_1cde = 0x1cde,
-	BNXT_ULP_CLASS_HID_192a = 0x192a,
-	BNXT_ULP_CLASS_HID_1276 = 0x1276,
-	BNXT_ULP_CLASS_HID_5f5e = 0x5f5e,
-	BNXT_ULP_CLASS_HID_5baa = 0x5baa,
-	BNXT_ULP_CLASS_HID_54f6 = 0x54f6,
-	BNXT_ULP_CLASS_HID_51c2 = 0x51c2,
-	BNXT_ULP_CLASS_HID_0386 = 0x0386,
-	BNXT_ULP_CLASS_HID_1cd2 = 0x1cd2,
-	BNXT_ULP_CLASS_HID_191e = 0x191e,
-	BNXT_ULP_CLASS_HID_126a = 0x126a,
-	BNXT_ULP_CLASS_HID_23ee = 0x23ee,
-	BNXT_ULP_CLASS_HID_3c3a = 0x3c3a,
-	BNXT_ULP_CLASS_HID_3906 = 0x3906,
-	BNXT_ULP_CLASS_HID_3252 = 0x3252,
-	BNXT_ULP_CLASS_HID_1a4e = 0x1a4e,
-	BNXT_ULP_CLASS_HID_169a = 0x169a,
-	BNXT_ULP_CLASS_HID_13e6 = 0x13e6,
-	BNXT_ULP_CLASS_HID_4be6 = 0x4be6,
-	BNXT_ULP_CLASS_HID_591a = 0x591a,
-	BNXT_ULP_CLASS_HID_5266 = 0x5266,
-	BNXT_ULP_CLASS_HID_2eb2 = 0x2eb2,
-	BNXT_ULP_CLASS_HID_2bfe = 0x2bfe,
-	BNXT_ULP_CLASS_HID_4dee = 0x4dee,
-	BNXT_ULP_CLASS_HID_463a = 0x463a,
-	BNXT_ULP_CLASS_HID_4306 = 0x4306,
-	BNXT_ULP_CLASS_HID_5c52 = 0x5c52,
-	BNXT_ULP_CLASS_HID_0e22 = 0x0e22,
-	BNXT_ULP_CLASS_HID_0b6e = 0x0b6e,
-	BNXT_ULP_CLASS_HID_07ba = 0x07ba,
-	BNXT_ULP_CLASS_HID_0086 = 0x0086,
-	BNXT_ULP_CLASS_HID_47b6 = 0x47b6,
-	BNXT_ULP_CLASS_HID_4082 = 0x4082,
-	BNXT_ULP_CLASS_HID_5dce = 0x5dce,
-	BNXT_ULP_CLASS_HID_561a = 0x561a,
-	BNXT_ULP_CLASS_HID_244e = 0x244e,
-	BNXT_ULP_CLASS_HID_209a = 0x209a,
-	BNXT_ULP_CLASS_HID_3de6 = 0x3de6,
-	BNXT_ULP_CLASS_HID_3632 = 0x3632,
-	BNXT_ULP_CLASS_HID_47aa = 0x47aa,
-	BNXT_ULP_CLASS_HID_40f6 = 0x40f6,
-	BNXT_ULP_CLASS_HID_5dc2 = 0x5dc2,
-	BNXT_ULP_CLASS_HID_560e = 0x560e,
-	BNXT_ULP_CLASS_HID_08de = 0x08de,
-	BNXT_ULP_CLASS_HID_052a = 0x052a,
-	BNXT_ULP_CLASS_HID_1e76 = 0x1e76,
-	BNXT_ULP_CLASS_HID_1b42 = 0x1b42,
-	BNXT_ULP_CLASS_HID_5e72 = 0x5e72,
-	BNXT_ULP_CLASS_HID_5abe = 0x5abe,
-	BNXT_ULP_CLASS_HID_578a = 0x578a,
-	BNXT_ULP_CLASS_HID_50d6 = 0x50d6,
-	BNXT_ULP_CLASS_HID_3e0a = 0x3e0a,
-	BNXT_ULP_CLASS_HID_3b56 = 0x3b56,
-	BNXT_ULP_CLASS_HID_37a2 = 0x37a2,
-	BNXT_ULP_CLASS_HID_30ee = 0x30ee,
-	BNXT_ULP_CLASS_HID_5e66 = 0x5e66,
-	BNXT_ULP_CLASS_HID_5ab2 = 0x5ab2,
-	BNXT_ULP_CLASS_HID_57fe = 0x57fe,
-	BNXT_ULP_CLASS_HID_50ca = 0x50ca,
-	BNXT_ULP_CLASS_HID_029a = 0x029a,
-	BNXT_ULP_CLASS_HID_1fe6 = 0x1fe6,
-	BNXT_ULP_CLASS_HID_1832 = 0x1832,
-	BNXT_ULP_CLASS_HID_157e = 0x157e,
-	BNXT_ULP_CLASS_HID_582e = 0x582e,
-	BNXT_ULP_CLASS_HID_557a = 0x557a,
-	BNXT_ULP_CLASS_HID_2e46 = 0x2e46,
-	BNXT_ULP_CLASS_HID_2a92 = 0x2a92,
-	BNXT_ULP_CLASS_HID_38c6 = 0x38c6,
-	BNXT_ULP_CLASS_HID_3512 = 0x3512,
-	BNXT_ULP_CLASS_HID_0e5e = 0x0e5e,
-	BNXT_ULP_CLASS_HID_0aaa = 0x0aaa,
-	BNXT_ULP_CLASS_HID_5822 = 0x5822,
-	BNXT_ULP_CLASS_HID_556e = 0x556e,
-	BNXT_ULP_CLASS_HID_51ba = 0x51ba,
-	BNXT_ULP_CLASS_HID_2a86 = 0x2a86,
-	BNXT_ULP_CLASS_HID_1d56 = 0x1d56,
-	BNXT_ULP_CLASS_HID_19a2 = 0x19a2,
-	BNXT_ULP_CLASS_HID_12ee = 0x12ee,
-	BNXT_ULP_CLASS_HID_4aee = 0x4aee,
-	BNXT_ULP_CLASS_HID_52ea = 0x52ea,
-	BNXT_ULP_CLASS_HID_2f36 = 0x2f36,
-	BNXT_ULP_CLASS_HID_2802 = 0x2802,
-	BNXT_ULP_CLASS_HID_254e = 0x254e,
-	BNXT_ULP_CLASS_HID_3282 = 0x3282,
-	BNXT_ULP_CLASS_HID_0fce = 0x0fce,
-	BNXT_ULP_CLASS_HID_081a = 0x081a,
-	BNXT_ULP_CLASS_HID_0566 = 0x0566,
-	BNXT_ULP_CLASS_HID_34d6 = 0x34d6,
-	BNXT_ULP_CLASS_HID_3a1a = 0x3a1a,
-	BNXT_ULP_CLASS_HID_5a02 = 0x5a02,
-	BNXT_ULP_CLASS_HID_543e = 0x543e,
-	BNXT_ULP_CLASS_HID_09aa = 0x09aa,
-	BNXT_ULP_CLASS_HID_0276 = 0x0276,
-	BNXT_ULP_CLASS_HID_1f02 = 0x1f02,
-	BNXT_ULP_CLASS_HID_1bce = 0x1bce,
-	BNXT_ULP_CLASS_HID_2952 = 0x2952,
-	BNXT_ULP_CLASS_HID_221e = 0x221e,
-	BNXT_ULP_CLASS_HID_3f2a = 0x3f2a,
-	BNXT_ULP_CLASS_HID_3bf6 = 0x3bf6,
-	BNXT_ULP_CLASS_HID_03f2 = 0x03f2,
-	BNXT_ULP_CLASS_HID_1cbe = 0x1cbe,
-	BNXT_ULP_CLASS_HID_194a = 0x194a,
-	BNXT_ULP_CLASS_HID_1216 = 0x1216,
-	BNXT_ULP_CLASS_HID_5f3e = 0x5f3e,
-	BNXT_ULP_CLASS_HID_5bca = 0x5bca,
-	BNXT_ULP_CLASS_HID_5496 = 0x5496,
-	BNXT_ULP_CLASS_HID_51a2 = 0x51a2,
-	BNXT_ULP_CLASS_HID_03e6 = 0x03e6,
-	BNXT_ULP_CLASS_HID_1cb2 = 0x1cb2,
-	BNXT_ULP_CLASS_HID_197e = 0x197e,
-	BNXT_ULP_CLASS_HID_120a = 0x120a,
-	BNXT_ULP_CLASS_HID_238e = 0x238e,
-	BNXT_ULP_CLASS_HID_3c5a = 0x3c5a,
-	BNXT_ULP_CLASS_HID_3966 = 0x3966,
-	BNXT_ULP_CLASS_HID_3232 = 0x3232,
-	BNXT_ULP_CLASS_HID_1a2e = 0x1a2e,
-	BNXT_ULP_CLASS_HID_16fa = 0x16fa,
-	BNXT_ULP_CLASS_HID_1386 = 0x1386,
-	BNXT_ULP_CLASS_HID_4b86 = 0x4b86,
-	BNXT_ULP_CLASS_HID_597a = 0x597a,
-	BNXT_ULP_CLASS_HID_5206 = 0x5206,
-	BNXT_ULP_CLASS_HID_2ed2 = 0x2ed2,
-	BNXT_ULP_CLASS_HID_2b9e = 0x2b9e,
-	BNXT_ULP_CLASS_HID_4d8e = 0x4d8e,
-	BNXT_ULP_CLASS_HID_465a = 0x465a,
-	BNXT_ULP_CLASS_HID_4366 = 0x4366,
-	BNXT_ULP_CLASS_HID_5c32 = 0x5c32,
-	BNXT_ULP_CLASS_HID_0e42 = 0x0e42,
-	BNXT_ULP_CLASS_HID_0b0e = 0x0b0e,
-	BNXT_ULP_CLASS_HID_07da = 0x07da,
-	BNXT_ULP_CLASS_HID_00e6 = 0x00e6,
-	BNXT_ULP_CLASS_HID_47d6 = 0x47d6,
-	BNXT_ULP_CLASS_HID_40e2 = 0x40e2,
-	BNXT_ULP_CLASS_HID_5dae = 0x5dae,
-	BNXT_ULP_CLASS_HID_567a = 0x567a,
-	BNXT_ULP_CLASS_HID_242e = 0x242e,
-	BNXT_ULP_CLASS_HID_20fa = 0x20fa,
-	BNXT_ULP_CLASS_HID_3d86 = 0x3d86,
-	BNXT_ULP_CLASS_HID_3652 = 0x3652,
-	BNXT_ULP_CLASS_HID_47ca = 0x47ca,
-	BNXT_ULP_CLASS_HID_4096 = 0x4096,
-	BNXT_ULP_CLASS_HID_5da2 = 0x5da2,
-	BNXT_ULP_CLASS_HID_566e = 0x566e,
-	BNXT_ULP_CLASS_HID_08be = 0x08be,
-	BNXT_ULP_CLASS_HID_054a = 0x054a,
-	BNXT_ULP_CLASS_HID_1e16 = 0x1e16,
-	BNXT_ULP_CLASS_HID_1b22 = 0x1b22,
-	BNXT_ULP_CLASS_HID_5e12 = 0x5e12,
-	BNXT_ULP_CLASS_HID_5ade = 0x5ade,
-	BNXT_ULP_CLASS_HID_57ea = 0x57ea,
-	BNXT_ULP_CLASS_HID_50b6 = 0x50b6,
-	BNXT_ULP_CLASS_HID_3e6a = 0x3e6a,
-	BNXT_ULP_CLASS_HID_3b36 = 0x3b36,
-	BNXT_ULP_CLASS_HID_37c2 = 0x37c2,
-	BNXT_ULP_CLASS_HID_308e = 0x308e,
-	BNXT_ULP_CLASS_HID_5e06 = 0x5e06,
-	BNXT_ULP_CLASS_HID_5ad2 = 0x5ad2,
-	BNXT_ULP_CLASS_HID_579e = 0x579e,
-	BNXT_ULP_CLASS_HID_50aa = 0x50aa,
-	BNXT_ULP_CLASS_HID_02fa = 0x02fa,
-	BNXT_ULP_CLASS_HID_1f86 = 0x1f86,
-	BNXT_ULP_CLASS_HID_1852 = 0x1852,
-	BNXT_ULP_CLASS_HID_151e = 0x151e,
-	BNXT_ULP_CLASS_HID_584e = 0x584e,
-	BNXT_ULP_CLASS_HID_551a = 0x551a,
-	BNXT_ULP_CLASS_HID_2e26 = 0x2e26,
-	BNXT_ULP_CLASS_HID_2af2 = 0x2af2,
-	BNXT_ULP_CLASS_HID_38a6 = 0x38a6,
-	BNXT_ULP_CLASS_HID_3572 = 0x3572,
-	BNXT_ULP_CLASS_HID_0e3e = 0x0e3e,
-	BNXT_ULP_CLASS_HID_0aca = 0x0aca,
-	BNXT_ULP_CLASS_HID_5842 = 0x5842,
-	BNXT_ULP_CLASS_HID_550e = 0x550e,
-	BNXT_ULP_CLASS_HID_51da = 0x51da,
-	BNXT_ULP_CLASS_HID_2ae6 = 0x2ae6,
-	BNXT_ULP_CLASS_HID_1d36 = 0x1d36,
-	BNXT_ULP_CLASS_HID_19c2 = 0x19c2,
-	BNXT_ULP_CLASS_HID_128e = 0x128e,
-	BNXT_ULP_CLASS_HID_4a8e = 0x4a8e,
-	BNXT_ULP_CLASS_HID_528a = 0x528a,
-	BNXT_ULP_CLASS_HID_2f56 = 0x2f56,
-	BNXT_ULP_CLASS_HID_2862 = 0x2862,
-	BNXT_ULP_CLASS_HID_252e = 0x252e,
-	BNXT_ULP_CLASS_HID_32e2 = 0x32e2,
-	BNXT_ULP_CLASS_HID_0fae = 0x0fae,
-	BNXT_ULP_CLASS_HID_087a = 0x087a,
-	BNXT_ULP_CLASS_HID_0506 = 0x0506,
-	BNXT_ULP_CLASS_HID_34b6 = 0x34b6,
-	BNXT_ULP_CLASS_HID_3a7a = 0x3a7a,
-	BNXT_ULP_CLASS_HID_5a62 = 0x5a62,
-	BNXT_ULP_CLASS_HID_545e = 0x545e,
-	BNXT_ULP_CLASS_HID_a73c = 0xa73c,
-	BNXT_ULP_CLASS_HID_a040 = 0xa040,
-	BNXT_ULP_CLASS_HID_1d640 = 0x1d640,
-	BNXT_ULP_CLASS_HID_1dd3c = 0x1dd3c,
-	BNXT_ULP_CLASS_HID_cba0 = 0xcba0,
-	BNXT_ULP_CLASS_HID_c4f4 = 0xc4f4,
-	BNXT_ULP_CLASS_HID_19f38 = 0x19f38,
-	BNXT_ULP_CLASS_HID_182f4 = 0x182f4,
-	BNXT_ULP_CLASS_HID_b098 = 0xb098,
-	BNXT_ULP_CLASS_HID_8dac = 0x8dac,
-	BNXT_ULP_CLASS_HID_1a3ac = 0x1a3ac,
-	BNXT_ULP_CLASS_HID_1a698 = 0x1a698,
-	BNXT_ULP_CLASS_HID_d50c = 0xd50c,
-	BNXT_ULP_CLASS_HID_ae50 = 0xae50,
-	BNXT_ULP_CLASS_HID_1c450 = 0x1c450,
-	BNXT_ULP_CLASS_HID_1cb0c = 0x1cb0c,
-	BNXT_ULP_CLASS_HID_a1f0 = 0xa1f0,
-	BNXT_ULP_CLASS_HID_ba04 = 0xba04,
-	BNXT_ULP_CLASS_HID_1d004 = 0x1d004,
-	BNXT_ULP_CLASS_HID_1d7f0 = 0x1d7f0,
-	BNXT_ULP_CLASS_HID_c264 = 0xc264,
-	BNXT_ULP_CLASS_HID_dea8 = 0xdea8,
-	BNXT_ULP_CLASS_HID_199fc = 0x199fc,
-	BNXT_ULP_CLASS_HID_19ca8 = 0x19ca8,
-	BNXT_ULP_CLASS_HID_8b5c = 0x8b5c,
-	BNXT_ULP_CLASS_HID_8460 = 0x8460,
-	BNXT_ULP_CLASS_HID_1ba60 = 0x1ba60,
-	BNXT_ULP_CLASS_HID_1a15c = 0x1a15c,
-	BNXT_ULP_CLASS_HID_afc0 = 0xafc0,
-	BNXT_ULP_CLASS_HID_a814 = 0xa814,
-	BNXT_ULP_CLASS_HID_1de14 = 0x1de14,
-	BNXT_ULP_CLASS_HID_1c5c0 = 0x1c5c0,
-	BNXT_ULP_CLASS_HID_8c2c = 0x8c2c,
-	BNXT_ULP_CLASS_HID_8970 = 0x8970,
-	BNXT_ULP_CLASS_HID_1bf70 = 0x1bf70,
-	BNXT_ULP_CLASS_HID_1a22c = 0x1a22c,
-	BNXT_ULP_CLASS_HID_d0d0 = 0xd0d0,
-	BNXT_ULP_CLASS_HID_ade4 = 0xade4,
-	BNXT_ULP_CLASS_HID_1c3e4 = 0x1c3e4,
-	BNXT_ULP_CLASS_HID_1c6d0 = 0x1c6d0,
-	BNXT_ULP_CLASS_HID_9988 = 0x9988,
-	BNXT_ULP_CLASS_HID_92dc = 0x92dc,
-	BNXT_ULP_CLASS_HID_188dc = 0x188dc,
-	BNXT_ULP_CLASS_HID_18f88 = 0x18f88,
-	BNXT_ULP_CLASS_HID_ba3c = 0xba3c,
-	BNXT_ULP_CLASS_HID_b740 = 0xb740,
-	BNXT_ULP_CLASS_HID_1ad40 = 0x1ad40,
-	BNXT_ULP_CLASS_HID_1d03c = 0x1d03c,
-	BNXT_ULP_CLASS_HID_86e0 = 0x86e0,
-	BNXT_ULP_CLASS_HID_8334 = 0x8334,
-	BNXT_ULP_CLASS_HID_1b934 = 0x1b934,
-	BNXT_ULP_CLASS_HID_1bce0 = 0x1bce0,
-	BNXT_ULP_CLASS_HID_aa94 = 0xaa94,
-	BNXT_ULP_CLASS_HID_a7d8 = 0xa7d8,
-	BNXT_ULP_CLASS_HID_1ddd8 = 0x1ddd8,
-	BNXT_ULP_CLASS_HID_1c094 = 0x1c094,
-	BNXT_ULP_CLASS_HID_904c = 0x904c,
-	BNXT_ULP_CLASS_HID_c84c = 0xc84c,
-	BNXT_ULP_CLASS_HID_18290 = 0x18290,
-	BNXT_ULP_CLASS_HID_1864c = 0x1864c,
-	BNXT_ULP_CLASS_HID_b4f0 = 0xb4f0,
-	BNXT_ULP_CLASS_HID_b104 = 0xb104,
-	BNXT_ULP_CLASS_HID_1a704 = 0x1a704,
-	BNXT_ULP_CLASS_HID_1aaf0 = 0x1aaf0,
-	BNXT_ULP_CLASS_HID_80a4 = 0x80a4,
-	BNXT_ULP_CLASS_HID_9de8 = 0x9de8,
-	BNXT_ULP_CLASS_HID_1b3e8 = 0x1b3e8,
-	BNXT_ULP_CLASS_HID_1b6a4 = 0x1b6a4,
-	BNXT_ULP_CLASS_HID_a548 = 0xa548,
-	BNXT_ULP_CLASS_HID_a19c = 0xa19c,
-	BNXT_ULP_CLASS_HID_1d79c = 0x1d79c,
-	BNXT_ULP_CLASS_HID_1db48 = 0x1db48,
-	BNXT_ULP_CLASS_HID_9a98 = 0x9a98,
-	BNXT_ULP_CLASS_HID_97ac = 0x97ac,
-	BNXT_ULP_CLASS_HID_18dac = 0x18dac,
-	BNXT_ULP_CLASS_HID_1b098 = 0x1b098,
-	BNXT_ULP_CLASS_HID_bf0c = 0xbf0c,
-	BNXT_ULP_CLASS_HID_b850 = 0xb850,
-	BNXT_ULP_CLASS_HID_1ae50 = 0x1ae50,
-	BNXT_ULP_CLASS_HID_1d50c = 0x1d50c,
-	BNXT_ULP_CLASS_HID_34f0 = 0x34f0,
-	BNXT_ULP_CLASS_HID_3a3c = 0x3a3c,
-	BNXT_ULP_CLASS_HID_3740 = 0x3740,
-	BNXT_ULP_CLASS_HID_5ea0 = 0x5ea0,
-	BNXT_ULP_CLASS_HID_5bf4 = 0x5bf4,
-	BNXT_ULP_CLASS_HID_0798 = 0x0798,
-	BNXT_ULP_CLASS_HID_00ac = 0x00ac,
-	BNXT_ULP_CLASS_HID_280c = 0x280c,
-	BNXT_ULP_CLASS_HID_2550 = 0x2550,
-	BNXT_ULP_CLASS_HID_3104 = 0x3104,
-	BNXT_ULP_CLASS_HID_5964 = 0x5964,
-	BNXT_ULP_CLASS_HID_55a8 = 0x55a8,
-	BNXT_ULP_CLASS_HID_1e5c = 0x1e5c,
-	BNXT_ULP_CLASS_HID_1b60 = 0x1b60,
-	BNXT_ULP_CLASS_HID_22c0 = 0x22c0,
-	BNXT_ULP_CLASS_HID_3f14 = 0x3f14,
-	BNXT_ULP_CLASS_HID_a71c = 0xa71c,
-	BNXT_ULP_CLASS_HID_a8dc = 0xa8dc,
-	BNXT_ULP_CLASS_HID_ed9c = 0xed9c,
-	BNXT_ULP_CLASS_HID_ef5c = 0xef5c,
-	BNXT_ULP_CLASS_HID_a060 = 0xa060,
-	BNXT_ULP_CLASS_HID_a520 = 0xa520,
-	BNXT_ULP_CLASS_HID_e6e0 = 0xe6e0,
-	BNXT_ULP_CLASS_HID_eba0 = 0xeba0,
-	BNXT_ULP_CLASS_HID_1d660 = 0x1d660,
-	BNXT_ULP_CLASS_HID_1fb20 = 0x1fb20,
-	BNXT_ULP_CLASS_HID_1dce0 = 0x1dce0,
-	BNXT_ULP_CLASS_HID_1e1a0 = 0x1e1a0,
-	BNXT_ULP_CLASS_HID_1dd1c = 0x1dd1c,
-	BNXT_ULP_CLASS_HID_1fedc = 0x1fedc,
-	BNXT_ULP_CLASS_HID_1c39c = 0x1c39c,
-	BNXT_ULP_CLASS_HID_1e55c = 0x1e55c,
-	BNXT_ULP_CLASS_HID_cb80 = 0xcb80,
-	BNXT_ULP_CLASS_HID_b194 = 0xb194,
-	BNXT_ULP_CLASS_HID_d354 = 0xd354,
-	BNXT_ULP_CLASS_HID_f414 = 0xf414,
-	BNXT_ULP_CLASS_HID_c4d4 = 0xc4d4,
-	BNXT_ULP_CLASS_HID_e994 = 0xe994,
-	BNXT_ULP_CLASS_HID_cb54 = 0xcb54,
-	BNXT_ULP_CLASS_HID_f158 = 0xf158,
-	BNXT_ULP_CLASS_HID_19f18 = 0x19f18,
-	BNXT_ULP_CLASS_HID_1a0d8 = 0x1a0d8,
-	BNXT_ULP_CLASS_HID_1c598 = 0x1c598,
-	BNXT_ULP_CLASS_HID_1e758 = 0x1e758,
-	BNXT_ULP_CLASS_HID_182d4 = 0x182d4,
-	BNXT_ULP_CLASS_HID_1a794 = 0x1a794,
-	BNXT_ULP_CLASS_HID_1c954 = 0x1c954,
-	BNXT_ULP_CLASS_HID_1ea14 = 0x1ea14,
-	BNXT_ULP_CLASS_HID_b0b8 = 0xb0b8,
-	BNXT_ULP_CLASS_HID_b278 = 0xb278,
-	BNXT_ULP_CLASS_HID_f738 = 0xf738,
-	BNXT_ULP_CLASS_HID_f8f8 = 0xf8f8,
-	BNXT_ULP_CLASS_HID_8d8c = 0x8d8c,
-	BNXT_ULP_CLASS_HID_af4c = 0xaf4c,
-	BNXT_ULP_CLASS_HID_f00c = 0xf00c,
-	BNXT_ULP_CLASS_HID_f5cc = 0xf5cc,
-	BNXT_ULP_CLASS_HID_1a38c = 0x1a38c,
-	BNXT_ULP_CLASS_HID_1a54c = 0x1a54c,
-	BNXT_ULP_CLASS_HID_1e60c = 0x1e60c,
-	BNXT_ULP_CLASS_HID_1ebcc = 0x1ebcc,
-	BNXT_ULP_CLASS_HID_1a6b8 = 0x1a6b8,
-	BNXT_ULP_CLASS_HID_1a878 = 0x1a878,
-	BNXT_ULP_CLASS_HID_1ed38 = 0x1ed38,
-	BNXT_ULP_CLASS_HID_1eef8 = 0x1eef8,
-	BNXT_ULP_CLASS_HID_d52c = 0xd52c,
-	BNXT_ULP_CLASS_HID_f6ec = 0xf6ec,
-	BNXT_ULP_CLASS_HID_dbac = 0xdbac,
-	BNXT_ULP_CLASS_HID_fd6c = 0xfd6c,
-	BNXT_ULP_CLASS_HID_ae70 = 0xae70,
-	BNXT_ULP_CLASS_HID_f330 = 0xf330,
-	BNXT_ULP_CLASS_HID_d4f0 = 0xd4f0,
-	BNXT_ULP_CLASS_HID_f9b0 = 0xf9b0,
-	BNXT_ULP_CLASS_HID_1c470 = 0x1c470,
-	BNXT_ULP_CLASS_HID_1e930 = 0x1e930,
-	BNXT_ULP_CLASS_HID_1caf0 = 0x1caf0,
-	BNXT_ULP_CLASS_HID_1f084 = 0x1f084,
-	BNXT_ULP_CLASS_HID_1cb2c = 0x1cb2c,
-	BNXT_ULP_CLASS_HID_1b130 = 0x1b130,
-	BNXT_ULP_CLASS_HID_1d2f0 = 0x1d2f0,
-	BNXT_ULP_CLASS_HID_1f7b0 = 0x1f7b0,
-	BNXT_ULP_CLASS_HID_a1d0 = 0xa1d0,
-	BNXT_ULP_CLASS_HID_a290 = 0xa290,
-	BNXT_ULP_CLASS_HID_e450 = 0xe450,
-	BNXT_ULP_CLASS_HID_e910 = 0xe910,
-	BNXT_ULP_CLASS_HID_ba24 = 0xba24,
-	BNXT_ULP_CLASS_HID_bfe4 = 0xbfe4,
-	BNXT_ULP_CLASS_HID_e0a4 = 0xe0a4,
-	BNXT_ULP_CLASS_HID_e264 = 0xe264,
-	BNXT_ULP_CLASS_HID_1d024 = 0x1d024,
-	BNXT_ULP_CLASS_HID_1f5e4 = 0x1f5e4,
-	BNXT_ULP_CLASS_HID_1d6a4 = 0x1d6a4,
-	BNXT_ULP_CLASS_HID_1f864 = 0x1f864,
-	BNXT_ULP_CLASS_HID_1d7d0 = 0x1d7d0,
-	BNXT_ULP_CLASS_HID_1f890 = 0x1f890,
-	BNXT_ULP_CLASS_HID_1da50 = 0x1da50,
-	BNXT_ULP_CLASS_HID_1ff10 = 0x1ff10,
-	BNXT_ULP_CLASS_HID_c244 = 0xc244,
-	BNXT_ULP_CLASS_HID_e704 = 0xe704,
-	BNXT_ULP_CLASS_HID_c8c4 = 0xc8c4,
-	BNXT_ULP_CLASS_HID_ed84 = 0xed84,
-	BNXT_ULP_CLASS_HID_de88 = 0xde88,
-	BNXT_ULP_CLASS_HID_e048 = 0xe048,
-	BNXT_ULP_CLASS_HID_c508 = 0xc508,
-	BNXT_ULP_CLASS_HID_e6c8 = 0xe6c8,
-	BNXT_ULP_CLASS_HID_199dc = 0x199dc,
-	BNXT_ULP_CLASS_HID_1ba9c = 0x1ba9c,
-	BNXT_ULP_CLASS_HID_1dc5c = 0x1dc5c,
-	BNXT_ULP_CLASS_HID_1e11c = 0x1e11c,
-	BNXT_ULP_CLASS_HID_19c88 = 0x19c88,
-	BNXT_ULP_CLASS_HID_1be48 = 0x1be48,
-	BNXT_ULP_CLASS_HID_1c308 = 0x1c308,
-	BNXT_ULP_CLASS_HID_1e4c8 = 0x1e4c8,
-	BNXT_ULP_CLASS_HID_8b7c = 0x8b7c,
-	BNXT_ULP_CLASS_HID_ac3c = 0xac3c,
-	BNXT_ULP_CLASS_HID_f1fc = 0xf1fc,
-	BNXT_ULP_CLASS_HID_f2bc = 0xf2bc,
-	BNXT_ULP_CLASS_HID_8440 = 0x8440,
-	BNXT_ULP_CLASS_HID_a900 = 0xa900,
-	BNXT_ULP_CLASS_HID_cac0 = 0xcac0,
-	BNXT_ULP_CLASS_HID_ef80 = 0xef80,
-	BNXT_ULP_CLASS_HID_1ba40 = 0x1ba40,
-	BNXT_ULP_CLASS_HID_1bf00 = 0x1bf00,
-	BNXT_ULP_CLASS_HID_1e0c0 = 0x1e0c0,
-	BNXT_ULP_CLASS_HID_1e580 = 0x1e580,
-	BNXT_ULP_CLASS_HID_1a17c = 0x1a17c,
-	BNXT_ULP_CLASS_HID_1a23c = 0x1a23c,
-	BNXT_ULP_CLASS_HID_1e7fc = 0x1e7fc,
-	BNXT_ULP_CLASS_HID_1e8bc = 0x1e8bc,
-	BNXT_ULP_CLASS_HID_afe0 = 0xafe0,
-	BNXT_ULP_CLASS_HID_f0a0 = 0xf0a0,
-	BNXT_ULP_CLASS_HID_d260 = 0xd260,
-	BNXT_ULP_CLASS_HID_f720 = 0xf720,
-	BNXT_ULP_CLASS_HID_a834 = 0xa834,
-	BNXT_ULP_CLASS_HID_adf4 = 0xadf4,
-	BNXT_ULP_CLASS_HID_eeb4 = 0xeeb4,
-	BNXT_ULP_CLASS_HID_f074 = 0xf074,
-	BNXT_ULP_CLASS_HID_1de34 = 0x1de34,
-	BNXT_ULP_CLASS_HID_1e3f4 = 0x1e3f4,
-	BNXT_ULP_CLASS_HID_1c4b4 = 0x1c4b4,
-	BNXT_ULP_CLASS_HID_1e674 = 0x1e674,
-	BNXT_ULP_CLASS_HID_1c5e0 = 0x1c5e0,
-	BNXT_ULP_CLASS_HID_1e6a0 = 0x1e6a0,
-	BNXT_ULP_CLASS_HID_1c860 = 0x1c860,
-	BNXT_ULP_CLASS_HID_1ed20 = 0x1ed20,
-	BNXT_ULP_CLASS_HID_8c0c = 0x8c0c,
-	BNXT_ULP_CLASS_HID_b1cc = 0xb1cc,
-	BNXT_ULP_CLASS_HID_f28c = 0xf28c,
-	BNXT_ULP_CLASS_HID_f44c = 0xf44c,
-	BNXT_ULP_CLASS_HID_8950 = 0x8950,
-	BNXT_ULP_CLASS_HID_aa10 = 0xaa10,
-	BNXT_ULP_CLASS_HID_cfd0 = 0xcfd0,
-	BNXT_ULP_CLASS_HID_f090 = 0xf090,
-	BNXT_ULP_CLASS_HID_1bf50 = 0x1bf50,
-	BNXT_ULP_CLASS_HID_1a010 = 0x1a010,
-	BNXT_ULP_CLASS_HID_1e5d0 = 0x1e5d0,
-	BNXT_ULP_CLASS_HID_1e690 = 0x1e690,
-	BNXT_ULP_CLASS_HID_1a20c = 0x1a20c,
-	BNXT_ULP_CLASS_HID_1a7cc = 0x1a7cc,
-	BNXT_ULP_CLASS_HID_1e88c = 0x1e88c,
-	BNXT_ULP_CLASS_HID_1ea4c = 0x1ea4c,
-	BNXT_ULP_CLASS_HID_d0f0 = 0xd0f0,
-	BNXT_ULP_CLASS_HID_f5b0 = 0xf5b0,
-	BNXT_ULP_CLASS_HID_d770 = 0xd770,
-	BNXT_ULP_CLASS_HID_f830 = 0xf830,
-	BNXT_ULP_CLASS_HID_adc4 = 0xadc4,
-	BNXT_ULP_CLASS_HID_ae84 = 0xae84,
-	BNXT_ULP_CLASS_HID_d044 = 0xd044,
-	BNXT_ULP_CLASS_HID_f504 = 0xf504,
-	BNXT_ULP_CLASS_HID_1c3c4 = 0x1c3c4,
-	BNXT_ULP_CLASS_HID_1e484 = 0x1e484,
-	BNXT_ULP_CLASS_HID_1c644 = 0x1c644,
-	BNXT_ULP_CLASS_HID_1eb04 = 0x1eb04,
-	BNXT_ULP_CLASS_HID_1c6f0 = 0x1c6f0,
-	BNXT_ULP_CLASS_HID_1ebb0 = 0x1ebb0,
-	BNXT_ULP_CLASS_HID_1cd70 = 0x1cd70,
-	BNXT_ULP_CLASS_HID_1f304 = 0x1f304,
-	BNXT_ULP_CLASS_HID_99a8 = 0x99a8,
-	BNXT_ULP_CLASS_HID_bb68 = 0xbb68,
-	BNXT_ULP_CLASS_HID_dc28 = 0xdc28,
-	BNXT_ULP_CLASS_HID_e1e8 = 0xe1e8,
-	BNXT_ULP_CLASS_HID_92fc = 0x92fc,
-	BNXT_ULP_CLASS_HID_b7bc = 0xb7bc,
-	BNXT_ULP_CLASS_HID_d97c = 0xd97c,
-	BNXT_ULP_CLASS_HID_fa3c = 0xfa3c,
-	BNXT_ULP_CLASS_HID_188fc = 0x188fc,
-	BNXT_ULP_CLASS_HID_1adbc = 0x1adbc,
-	BNXT_ULP_CLASS_HID_1cf7c = 0x1cf7c,
-	BNXT_ULP_CLASS_HID_1f03c = 0x1f03c,
-	BNXT_ULP_CLASS_HID_18fa8 = 0x18fa8,
-	BNXT_ULP_CLASS_HID_1b168 = 0x1b168,
-	BNXT_ULP_CLASS_HID_1f228 = 0x1f228,
-	BNXT_ULP_CLASS_HID_1f7e8 = 0x1f7e8,
-	BNXT_ULP_CLASS_HID_ba1c = 0xba1c,
-	BNXT_ULP_CLASS_HID_bfdc = 0xbfdc,
-	BNXT_ULP_CLASS_HID_e09c = 0xe09c,
-	BNXT_ULP_CLASS_HID_e25c = 0xe25c,
-	BNXT_ULP_CLASS_HID_b760 = 0xb760,
-	BNXT_ULP_CLASS_HID_b820 = 0xb820,
-	BNXT_ULP_CLASS_HID_fde0 = 0xfde0,
-	BNXT_ULP_CLASS_HID_fea0 = 0xfea0,
-	BNXT_ULP_CLASS_HID_1ad60 = 0x1ad60,
-	BNXT_ULP_CLASS_HID_1ae20 = 0x1ae20,
-	BNXT_ULP_CLASS_HID_1d3e0 = 0x1d3e0,
-	BNXT_ULP_CLASS_HID_1f4a0 = 0x1f4a0,
-	BNXT_ULP_CLASS_HID_1d01c = 0x1d01c,
-	BNXT_ULP_CLASS_HID_1f5dc = 0x1f5dc,
-	BNXT_ULP_CLASS_HID_1d69c = 0x1d69c,
-	BNXT_ULP_CLASS_HID_1f85c = 0x1f85c,
-	BNXT_ULP_CLASS_HID_86c0 = 0x86c0,
-	BNXT_ULP_CLASS_HID_ab80 = 0xab80,
-	BNXT_ULP_CLASS_HID_cd40 = 0xcd40,
-	BNXT_ULP_CLASS_HID_ee00 = 0xee00,
-	BNXT_ULP_CLASS_HID_8314 = 0x8314,
-	BNXT_ULP_CLASS_HID_a4d4 = 0xa4d4,
-	BNXT_ULP_CLASS_HID_c994 = 0xc994,
-	BNXT_ULP_CLASS_HID_eb54 = 0xeb54,
-	BNXT_ULP_CLASS_HID_1b914 = 0x1b914,
-	BNXT_ULP_CLASS_HID_1bad4 = 0x1bad4,
-	BNXT_ULP_CLASS_HID_1ff94 = 0x1ff94,
-	BNXT_ULP_CLASS_HID_1e154 = 0x1e154,
-	BNXT_ULP_CLASS_HID_1bcc0 = 0x1bcc0,
-	BNXT_ULP_CLASS_HID_1a180 = 0x1a180,
-	BNXT_ULP_CLASS_HID_1e340 = 0x1e340,
-	BNXT_ULP_CLASS_HID_1e400 = 0x1e400,
-	BNXT_ULP_CLASS_HID_aab4 = 0xaab4,
-	BNXT_ULP_CLASS_HID_ac74 = 0xac74,
-	BNXT_ULP_CLASS_HID_d134 = 0xd134,
-	BNXT_ULP_CLASS_HID_f2f4 = 0xf2f4,
-	BNXT_ULP_CLASS_HID_a7f8 = 0xa7f8,
-	BNXT_ULP_CLASS_HID_a8b8 = 0xa8b8,
-	BNXT_ULP_CLASS_HID_ea78 = 0xea78,
-	BNXT_ULP_CLASS_HID_ef38 = 0xef38,
-	BNXT_ULP_CLASS_HID_1ddf8 = 0x1ddf8,
-	BNXT_ULP_CLASS_HID_1feb8 = 0x1feb8,
-	BNXT_ULP_CLASS_HID_1c078 = 0x1c078,
-	BNXT_ULP_CLASS_HID_1e538 = 0x1e538,
-	BNXT_ULP_CLASS_HID_1c0b4 = 0x1c0b4,
-	BNXT_ULP_CLASS_HID_1e274 = 0x1e274,
-	BNXT_ULP_CLASS_HID_1c734 = 0x1c734,
-	BNXT_ULP_CLASS_HID_1e8f4 = 0x1e8f4,
-	BNXT_ULP_CLASS_HID_906c = 0x906c,
-	BNXT_ULP_CLASS_HID_b52c = 0xb52c,
-	BNXT_ULP_CLASS_HID_d6ec = 0xd6ec,
-	BNXT_ULP_CLASS_HID_fbac = 0xfbac,
-	BNXT_ULP_CLASS_HID_c86c = 0xc86c,
-	BNXT_ULP_CLASS_HID_ed2c = 0xed2c,
-	BNXT_ULP_CLASS_HID_d330 = 0xd330,
-	BNXT_ULP_CLASS_HID_f4f0 = 0xf4f0,
-	BNXT_ULP_CLASS_HID_182b0 = 0x182b0,
-	BNXT_ULP_CLASS_HID_1a470 = 0x1a470,
-	BNXT_ULP_CLASS_HID_1c930 = 0x1c930,
-	BNXT_ULP_CLASS_HID_1eaf0 = 0x1eaf0,
-	BNXT_ULP_CLASS_HID_1866c = 0x1866c,
-	BNXT_ULP_CLASS_HID_1ab2c = 0x1ab2c,
-	BNXT_ULP_CLASS_HID_1ccec = 0x1ccec,
-	BNXT_ULP_CLASS_HID_1f1ac = 0x1f1ac,
-	BNXT_ULP_CLASS_HID_b4d0 = 0xb4d0,
-	BNXT_ULP_CLASS_HID_b990 = 0xb990,
-	BNXT_ULP_CLASS_HID_fb50 = 0xfb50,
-	BNXT_ULP_CLASS_HID_fc10 = 0xfc10,
-	BNXT_ULP_CLASS_HID_b124 = 0xb124,
-	BNXT_ULP_CLASS_HID_b2e4 = 0xb2e4,
-	BNXT_ULP_CLASS_HID_f7a4 = 0xf7a4,
-	BNXT_ULP_CLASS_HID_f964 = 0xf964,
-	BNXT_ULP_CLASS_HID_1a724 = 0x1a724,
-	BNXT_ULP_CLASS_HID_1a8e4 = 0x1a8e4,
-	BNXT_ULP_CLASS_HID_1eda4 = 0x1eda4,
-	BNXT_ULP_CLASS_HID_1ef64 = 0x1ef64,
-	BNXT_ULP_CLASS_HID_1aad0 = 0x1aad0,
-	BNXT_ULP_CLASS_HID_1af90 = 0x1af90,
-	BNXT_ULP_CLASS_HID_1d150 = 0x1d150,
-	BNXT_ULP_CLASS_HID_1f210 = 0x1f210,
-	BNXT_ULP_CLASS_HID_8084 = 0x8084,
-	BNXT_ULP_CLASS_HID_a244 = 0xa244,
-	BNXT_ULP_CLASS_HID_c704 = 0xc704,
-	BNXT_ULP_CLASS_HID_e8c4 = 0xe8c4,
-	BNXT_ULP_CLASS_HID_9dc8 = 0x9dc8,
-	BNXT_ULP_CLASS_HID_be88 = 0xbe88,
-	BNXT_ULP_CLASS_HID_c048 = 0xc048,
-	BNXT_ULP_CLASS_HID_e508 = 0xe508,
-	BNXT_ULP_CLASS_HID_1b3c8 = 0x1b3c8,
-	BNXT_ULP_CLASS_HID_1b488 = 0x1b488,
-	BNXT_ULP_CLASS_HID_1f648 = 0x1f648,
-	BNXT_ULP_CLASS_HID_1fb08 = 0x1fb08,
-	BNXT_ULP_CLASS_HID_1b684 = 0x1b684,
-	BNXT_ULP_CLASS_HID_1b844 = 0x1b844,
-	BNXT_ULP_CLASS_HID_1fd04 = 0x1fd04,
-	BNXT_ULP_CLASS_HID_1fec4 = 0x1fec4,
-	BNXT_ULP_CLASS_HID_a568 = 0xa568,
-	BNXT_ULP_CLASS_HID_a628 = 0xa628,
-	BNXT_ULP_CLASS_HID_ebe8 = 0xebe8,
-	BNXT_ULP_CLASS_HID_eca8 = 0xeca8,
-	BNXT_ULP_CLASS_HID_a1bc = 0xa1bc,
-	BNXT_ULP_CLASS_HID_a37c = 0xa37c,
-	BNXT_ULP_CLASS_HID_e43c = 0xe43c,
-	BNXT_ULP_CLASS_HID_e9fc = 0xe9fc,
-	BNXT_ULP_CLASS_HID_1d7bc = 0x1d7bc,
-	BNXT_ULP_CLASS_HID_1f97c = 0x1f97c,
-	BNXT_ULP_CLASS_HID_1da3c = 0x1da3c,
-	BNXT_ULP_CLASS_HID_1fffc = 0x1fffc,
-	BNXT_ULP_CLASS_HID_1db68 = 0x1db68,
-	BNXT_ULP_CLASS_HID_1fc28 = 0x1fc28,
-	BNXT_ULP_CLASS_HID_1c1e8 = 0x1c1e8,
-	BNXT_ULP_CLASS_HID_1e2a8 = 0x1e2a8,
-	BNXT_ULP_CLASS_HID_9ab8 = 0x9ab8,
-	BNXT_ULP_CLASS_HID_bc78 = 0xbc78,
-	BNXT_ULP_CLASS_HID_c138 = 0xc138,
-	BNXT_ULP_CLASS_HID_e2f8 = 0xe2f8,
-	BNXT_ULP_CLASS_HID_978c = 0x978c,
-	BNXT_ULP_CLASS_HID_b94c = 0xb94c,
-	BNXT_ULP_CLASS_HID_da0c = 0xda0c,
-	BNXT_ULP_CLASS_HID_ffcc = 0xffcc,
-	BNXT_ULP_CLASS_HID_18d8c = 0x18d8c,
-	BNXT_ULP_CLASS_HID_1af4c = 0x1af4c,
-	BNXT_ULP_CLASS_HID_1f00c = 0x1f00c,
-	BNXT_ULP_CLASS_HID_1f5cc = 0x1f5cc,
-	BNXT_ULP_CLASS_HID_1b0b8 = 0x1b0b8,
-	BNXT_ULP_CLASS_HID_1b278 = 0x1b278,
-	BNXT_ULP_CLASS_HID_1f738 = 0x1f738,
-	BNXT_ULP_CLASS_HID_1f8f8 = 0x1f8f8,
-	BNXT_ULP_CLASS_HID_bf2c = 0xbf2c,
-	BNXT_ULP_CLASS_HID_a0ec = 0xa0ec,
-	BNXT_ULP_CLASS_HID_e5ac = 0xe5ac,
-	BNXT_ULP_CLASS_HID_e76c = 0xe76c,
-	BNXT_ULP_CLASS_HID_b870 = 0xb870,
-	BNXT_ULP_CLASS_HID_bd30 = 0xbd30,
-	BNXT_ULP_CLASS_HID_fef0 = 0xfef0,
-	BNXT_ULP_CLASS_HID_e3b0 = 0xe3b0,
-	BNXT_ULP_CLASS_HID_1ae70 = 0x1ae70,
-	BNXT_ULP_CLASS_HID_1f330 = 0x1f330,
-	BNXT_ULP_CLASS_HID_1d4f0 = 0x1d4f0,
-	BNXT_ULP_CLASS_HID_1f9b0 = 0x1f9b0,
-	BNXT_ULP_CLASS_HID_1d52c = 0x1d52c,
-	BNXT_ULP_CLASS_HID_1f6ec = 0x1f6ec,
-	BNXT_ULP_CLASS_HID_1dbac = 0x1dbac,
-	BNXT_ULP_CLASS_HID_1fd6c = 0x1fd6c,
-	BNXT_ULP_CLASS_HID_34d0 = 0x34d0,
-	BNXT_ULP_CLASS_HID_3a1c = 0x3a1c,
-	BNXT_ULP_CLASS_HID_3760 = 0x3760,
-	BNXT_ULP_CLASS_HID_5e80 = 0x5e80,
-	BNXT_ULP_CLASS_HID_5bd4 = 0x5bd4,
-	BNXT_ULP_CLASS_HID_07b8 = 0x07b8,
-	BNXT_ULP_CLASS_HID_008c = 0x008c,
-	BNXT_ULP_CLASS_HID_282c = 0x282c,
-	BNXT_ULP_CLASS_HID_2570 = 0x2570,
-	BNXT_ULP_CLASS_HID_3124 = 0x3124,
-	BNXT_ULP_CLASS_HID_5944 = 0x5944,
-	BNXT_ULP_CLASS_HID_5588 = 0x5588,
-	BNXT_ULP_CLASS_HID_1e7c = 0x1e7c,
-	BNXT_ULP_CLASS_HID_1b40 = 0x1b40,
-	BNXT_ULP_CLASS_HID_22e0 = 0x22e0,
-	BNXT_ULP_CLASS_HID_3f34 = 0x3f34,
-	BNXT_ULP_CLASS_HID_a77c = 0xa77c,
-	BNXT_ULP_CLASS_HID_a8bc = 0xa8bc,
-	BNXT_ULP_CLASS_HID_edfc = 0xedfc,
-	BNXT_ULP_CLASS_HID_ef3c = 0xef3c,
-	BNXT_ULP_CLASS_HID_a000 = 0xa000,
-	BNXT_ULP_CLASS_HID_a540 = 0xa540,
-	BNXT_ULP_CLASS_HID_e680 = 0xe680,
-	BNXT_ULP_CLASS_HID_ebc0 = 0xebc0,
-	BNXT_ULP_CLASS_HID_1d600 = 0x1d600,
-	BNXT_ULP_CLASS_HID_1fb40 = 0x1fb40,
-	BNXT_ULP_CLASS_HID_1dc80 = 0x1dc80,
-	BNXT_ULP_CLASS_HID_1e1c0 = 0x1e1c0,
-	BNXT_ULP_CLASS_HID_1dd7c = 0x1dd7c,
-	BNXT_ULP_CLASS_HID_1febc = 0x1febc,
-	BNXT_ULP_CLASS_HID_1c3fc = 0x1c3fc,
-	BNXT_ULP_CLASS_HID_1e53c = 0x1e53c,
-	BNXT_ULP_CLASS_HID_cbe0 = 0xcbe0,
-	BNXT_ULP_CLASS_HID_b1f4 = 0xb1f4,
-	BNXT_ULP_CLASS_HID_d334 = 0xd334,
-	BNXT_ULP_CLASS_HID_f474 = 0xf474,
-	BNXT_ULP_CLASS_HID_c4b4 = 0xc4b4,
-	BNXT_ULP_CLASS_HID_e9f4 = 0xe9f4,
-	BNXT_ULP_CLASS_HID_cb34 = 0xcb34,
-	BNXT_ULP_CLASS_HID_f138 = 0xf138,
-	BNXT_ULP_CLASS_HID_19f78 = 0x19f78,
-	BNXT_ULP_CLASS_HID_1a0b8 = 0x1a0b8,
-	BNXT_ULP_CLASS_HID_1c5f8 = 0x1c5f8,
-	BNXT_ULP_CLASS_HID_1e738 = 0x1e738,
-	BNXT_ULP_CLASS_HID_182b4 = 0x182b4,
-	BNXT_ULP_CLASS_HID_1a7f4 = 0x1a7f4,
-	BNXT_ULP_CLASS_HID_1c934 = 0x1c934,
-	BNXT_ULP_CLASS_HID_1ea74 = 0x1ea74,
-	BNXT_ULP_CLASS_HID_b0d8 = 0xb0d8,
-	BNXT_ULP_CLASS_HID_b218 = 0xb218,
-	BNXT_ULP_CLASS_HID_f758 = 0xf758,
-	BNXT_ULP_CLASS_HID_f898 = 0xf898,
-	BNXT_ULP_CLASS_HID_8dec = 0x8dec,
-	BNXT_ULP_CLASS_HID_af2c = 0xaf2c,
-	BNXT_ULP_CLASS_HID_f06c = 0xf06c,
-	BNXT_ULP_CLASS_HID_f5ac = 0xf5ac,
-	BNXT_ULP_CLASS_HID_1a3ec = 0x1a3ec,
-	BNXT_ULP_CLASS_HID_1a52c = 0x1a52c,
-	BNXT_ULP_CLASS_HID_1e66c = 0x1e66c,
-	BNXT_ULP_CLASS_HID_1ebac = 0x1ebac,
-	BNXT_ULP_CLASS_HID_1a6d8 = 0x1a6d8,
-	BNXT_ULP_CLASS_HID_1a818 = 0x1a818,
-	BNXT_ULP_CLASS_HID_1ed58 = 0x1ed58,
-	BNXT_ULP_CLASS_HID_1ee98 = 0x1ee98,
-	BNXT_ULP_CLASS_HID_d54c = 0xd54c,
-	BNXT_ULP_CLASS_HID_f68c = 0xf68c,
-	BNXT_ULP_CLASS_HID_dbcc = 0xdbcc,
-	BNXT_ULP_CLASS_HID_fd0c = 0xfd0c,
-	BNXT_ULP_CLASS_HID_ae10 = 0xae10,
-	BNXT_ULP_CLASS_HID_f350 = 0xf350,
-	BNXT_ULP_CLASS_HID_d490 = 0xd490,
-	BNXT_ULP_CLASS_HID_f9d0 = 0xf9d0,
-	BNXT_ULP_CLASS_HID_1c410 = 0x1c410,
-	BNXT_ULP_CLASS_HID_1e950 = 0x1e950,
-	BNXT_ULP_CLASS_HID_1ca90 = 0x1ca90,
-	BNXT_ULP_CLASS_HID_1f0e4 = 0x1f0e4,
-	BNXT_ULP_CLASS_HID_1cb4c = 0x1cb4c,
-	BNXT_ULP_CLASS_HID_1b150 = 0x1b150,
-	BNXT_ULP_CLASS_HID_1d290 = 0x1d290,
-	BNXT_ULP_CLASS_HID_1f7d0 = 0x1f7d0,
-	BNXT_ULP_CLASS_HID_a1b0 = 0xa1b0,
-	BNXT_ULP_CLASS_HID_a2f0 = 0xa2f0,
-	BNXT_ULP_CLASS_HID_e430 = 0xe430,
-	BNXT_ULP_CLASS_HID_e970 = 0xe970,
-	BNXT_ULP_CLASS_HID_ba44 = 0xba44,
-	BNXT_ULP_CLASS_HID_bf84 = 0xbf84,
-	BNXT_ULP_CLASS_HID_e0c4 = 0xe0c4,
-	BNXT_ULP_CLASS_HID_e204 = 0xe204,
-	BNXT_ULP_CLASS_HID_1d044 = 0x1d044,
-	BNXT_ULP_CLASS_HID_1f584 = 0x1f584,
-	BNXT_ULP_CLASS_HID_1d6c4 = 0x1d6c4,
-	BNXT_ULP_CLASS_HID_1f804 = 0x1f804,
-	BNXT_ULP_CLASS_HID_1d7b0 = 0x1d7b0,
-	BNXT_ULP_CLASS_HID_1f8f0 = 0x1f8f0,
-	BNXT_ULP_CLASS_HID_1da30 = 0x1da30,
-	BNXT_ULP_CLASS_HID_1ff70 = 0x1ff70,
-	BNXT_ULP_CLASS_HID_c224 = 0xc224,
-	BNXT_ULP_CLASS_HID_e764 = 0xe764,
-	BNXT_ULP_CLASS_HID_c8a4 = 0xc8a4,
-	BNXT_ULP_CLASS_HID_ede4 = 0xede4,
-	BNXT_ULP_CLASS_HID_dee8 = 0xdee8,
-	BNXT_ULP_CLASS_HID_e028 = 0xe028,
-	BNXT_ULP_CLASS_HID_c568 = 0xc568,
-	BNXT_ULP_CLASS_HID_e6a8 = 0xe6a8,
-	BNXT_ULP_CLASS_HID_199bc = 0x199bc,
-	BNXT_ULP_CLASS_HID_1bafc = 0x1bafc,
-	BNXT_ULP_CLASS_HID_1dc3c = 0x1dc3c,
-	BNXT_ULP_CLASS_HID_1e17c = 0x1e17c,
-	BNXT_ULP_CLASS_HID_19ce8 = 0x19ce8,
-	BNXT_ULP_CLASS_HID_1be28 = 0x1be28,
-	BNXT_ULP_CLASS_HID_1c368 = 0x1c368,
-	BNXT_ULP_CLASS_HID_1e4a8 = 0x1e4a8,
-	BNXT_ULP_CLASS_HID_8b1c = 0x8b1c,
-	BNXT_ULP_CLASS_HID_ac5c = 0xac5c,
-	BNXT_ULP_CLASS_HID_f19c = 0xf19c,
-	BNXT_ULP_CLASS_HID_f2dc = 0xf2dc,
-	BNXT_ULP_CLASS_HID_8420 = 0x8420,
-	BNXT_ULP_CLASS_HID_a960 = 0xa960,
-	BNXT_ULP_CLASS_HID_caa0 = 0xcaa0,
-	BNXT_ULP_CLASS_HID_efe0 = 0xefe0,
-	BNXT_ULP_CLASS_HID_1ba20 = 0x1ba20,
-	BNXT_ULP_CLASS_HID_1bf60 = 0x1bf60,
-	BNXT_ULP_CLASS_HID_1e0a0 = 0x1e0a0,
-	BNXT_ULP_CLASS_HID_1e5e0 = 0x1e5e0,
-	BNXT_ULP_CLASS_HID_1a11c = 0x1a11c,
-	BNXT_ULP_CLASS_HID_1a25c = 0x1a25c,
-	BNXT_ULP_CLASS_HID_1e79c = 0x1e79c,
-	BNXT_ULP_CLASS_HID_1e8dc = 0x1e8dc,
-	BNXT_ULP_CLASS_HID_af80 = 0xaf80,
-	BNXT_ULP_CLASS_HID_f0c0 = 0xf0c0,
-	BNXT_ULP_CLASS_HID_d200 = 0xd200,
-	BNXT_ULP_CLASS_HID_f740 = 0xf740,
-	BNXT_ULP_CLASS_HID_a854 = 0xa854,
-	BNXT_ULP_CLASS_HID_ad94 = 0xad94,
-	BNXT_ULP_CLASS_HID_eed4 = 0xeed4,
-	BNXT_ULP_CLASS_HID_f014 = 0xf014,
-	BNXT_ULP_CLASS_HID_1de54 = 0x1de54,
-	BNXT_ULP_CLASS_HID_1e394 = 0x1e394,
-	BNXT_ULP_CLASS_HID_1c4d4 = 0x1c4d4,
-	BNXT_ULP_CLASS_HID_1e614 = 0x1e614,
-	BNXT_ULP_CLASS_HID_1c580 = 0x1c580,
-	BNXT_ULP_CLASS_HID_1e6c0 = 0x1e6c0,
-	BNXT_ULP_CLASS_HID_1c800 = 0x1c800,
-	BNXT_ULP_CLASS_HID_1ed40 = 0x1ed40,
-	BNXT_ULP_CLASS_HID_8c6c = 0x8c6c,
-	BNXT_ULP_CLASS_HID_b1ac = 0xb1ac,
-	BNXT_ULP_CLASS_HID_f2ec = 0xf2ec,
-	BNXT_ULP_CLASS_HID_f42c = 0xf42c,
-	BNXT_ULP_CLASS_HID_8930 = 0x8930,
-	BNXT_ULP_CLASS_HID_aa70 = 0xaa70,
-	BNXT_ULP_CLASS_HID_cfb0 = 0xcfb0,
-	BNXT_ULP_CLASS_HID_f0f0 = 0xf0f0,
-	BNXT_ULP_CLASS_HID_1bf30 = 0x1bf30,
-	BNXT_ULP_CLASS_HID_1a070 = 0x1a070,
-	BNXT_ULP_CLASS_HID_1e5b0 = 0x1e5b0,
-	BNXT_ULP_CLASS_HID_1e6f0 = 0x1e6f0,
-	BNXT_ULP_CLASS_HID_1a26c = 0x1a26c,
-	BNXT_ULP_CLASS_HID_1a7ac = 0x1a7ac,
-	BNXT_ULP_CLASS_HID_1e8ec = 0x1e8ec,
-	BNXT_ULP_CLASS_HID_1ea2c = 0x1ea2c,
-	BNXT_ULP_CLASS_HID_d090 = 0xd090,
-	BNXT_ULP_CLASS_HID_f5d0 = 0xf5d0,
-	BNXT_ULP_CLASS_HID_d710 = 0xd710,
-	BNXT_ULP_CLASS_HID_f850 = 0xf850,
-	BNXT_ULP_CLASS_HID_ada4 = 0xada4,
-	BNXT_ULP_CLASS_HID_aee4 = 0xaee4,
-	BNXT_ULP_CLASS_HID_d024 = 0xd024,
-	BNXT_ULP_CLASS_HID_f564 = 0xf564,
-	BNXT_ULP_CLASS_HID_1c3a4 = 0x1c3a4,
-	BNXT_ULP_CLASS_HID_1e4e4 = 0x1e4e4,
-	BNXT_ULP_CLASS_HID_1c624 = 0x1c624,
-	BNXT_ULP_CLASS_HID_1eb64 = 0x1eb64,
-	BNXT_ULP_CLASS_HID_1c690 = 0x1c690,
-	BNXT_ULP_CLASS_HID_1ebd0 = 0x1ebd0,
-	BNXT_ULP_CLASS_HID_1cd10 = 0x1cd10,
-	BNXT_ULP_CLASS_HID_1f364 = 0x1f364,
-	BNXT_ULP_CLASS_HID_99c8 = 0x99c8,
-	BNXT_ULP_CLASS_HID_bb08 = 0xbb08,
-	BNXT_ULP_CLASS_HID_dc48 = 0xdc48,
-	BNXT_ULP_CLASS_HID_e188 = 0xe188,
-	BNXT_ULP_CLASS_HID_929c = 0x929c,
-	BNXT_ULP_CLASS_HID_b7dc = 0xb7dc,
-	BNXT_ULP_CLASS_HID_d91c = 0xd91c,
-	BNXT_ULP_CLASS_HID_fa5c = 0xfa5c,
-	BNXT_ULP_CLASS_HID_1889c = 0x1889c,
-	BNXT_ULP_CLASS_HID_1addc = 0x1addc,
-	BNXT_ULP_CLASS_HID_1cf1c = 0x1cf1c,
-	BNXT_ULP_CLASS_HID_1f05c = 0x1f05c,
-	BNXT_ULP_CLASS_HID_18fc8 = 0x18fc8,
-	BNXT_ULP_CLASS_HID_1b108 = 0x1b108,
-	BNXT_ULP_CLASS_HID_1f248 = 0x1f248,
-	BNXT_ULP_CLASS_HID_1f788 = 0x1f788,
-	BNXT_ULP_CLASS_HID_ba7c = 0xba7c,
-	BNXT_ULP_CLASS_HID_bfbc = 0xbfbc,
-	BNXT_ULP_CLASS_HID_e0fc = 0xe0fc,
-	BNXT_ULP_CLASS_HID_e23c = 0xe23c,
-	BNXT_ULP_CLASS_HID_b700 = 0xb700,
-	BNXT_ULP_CLASS_HID_b840 = 0xb840,
-	BNXT_ULP_CLASS_HID_fd80 = 0xfd80,
-	BNXT_ULP_CLASS_HID_fec0 = 0xfec0,
-	BNXT_ULP_CLASS_HID_1ad00 = 0x1ad00,
-	BNXT_ULP_CLASS_HID_1ae40 = 0x1ae40,
-	BNXT_ULP_CLASS_HID_1d380 = 0x1d380,
-	BNXT_ULP_CLASS_HID_1f4c0 = 0x1f4c0,
-	BNXT_ULP_CLASS_HID_1d07c = 0x1d07c,
-	BNXT_ULP_CLASS_HID_1f5bc = 0x1f5bc,
-	BNXT_ULP_CLASS_HID_1d6fc = 0x1d6fc,
-	BNXT_ULP_CLASS_HID_1f83c = 0x1f83c,
-	BNXT_ULP_CLASS_HID_86a0 = 0x86a0,
-	BNXT_ULP_CLASS_HID_abe0 = 0xabe0,
-	BNXT_ULP_CLASS_HID_cd20 = 0xcd20,
-	BNXT_ULP_CLASS_HID_ee60 = 0xee60,
-	BNXT_ULP_CLASS_HID_8374 = 0x8374,
-	BNXT_ULP_CLASS_HID_a4b4 = 0xa4b4,
-	BNXT_ULP_CLASS_HID_c9f4 = 0xc9f4,
-	BNXT_ULP_CLASS_HID_eb34 = 0xeb34,
-	BNXT_ULP_CLASS_HID_1b974 = 0x1b974,
-	BNXT_ULP_CLASS_HID_1bab4 = 0x1bab4,
-	BNXT_ULP_CLASS_HID_1fff4 = 0x1fff4,
-	BNXT_ULP_CLASS_HID_1e134 = 0x1e134,
-	BNXT_ULP_CLASS_HID_1bca0 = 0x1bca0,
-	BNXT_ULP_CLASS_HID_1a1e0 = 0x1a1e0,
-	BNXT_ULP_CLASS_HID_1e320 = 0x1e320,
-	BNXT_ULP_CLASS_HID_1e460 = 0x1e460,
-	BNXT_ULP_CLASS_HID_aad4 = 0xaad4,
-	BNXT_ULP_CLASS_HID_ac14 = 0xac14,
-	BNXT_ULP_CLASS_HID_d154 = 0xd154,
-	BNXT_ULP_CLASS_HID_f294 = 0xf294,
-	BNXT_ULP_CLASS_HID_a798 = 0xa798,
-	BNXT_ULP_CLASS_HID_a8d8 = 0xa8d8,
-	BNXT_ULP_CLASS_HID_ea18 = 0xea18,
-	BNXT_ULP_CLASS_HID_ef58 = 0xef58,
-	BNXT_ULP_CLASS_HID_1dd98 = 0x1dd98,
-	BNXT_ULP_CLASS_HID_1fed8 = 0x1fed8,
-	BNXT_ULP_CLASS_HID_1c018 = 0x1c018,
-	BNXT_ULP_CLASS_HID_1e558 = 0x1e558,
-	BNXT_ULP_CLASS_HID_1c0d4 = 0x1c0d4,
-	BNXT_ULP_CLASS_HID_1e214 = 0x1e214,
-	BNXT_ULP_CLASS_HID_1c754 = 0x1c754,
-	BNXT_ULP_CLASS_HID_1e894 = 0x1e894,
-	BNXT_ULP_CLASS_HID_900c = 0x900c,
-	BNXT_ULP_CLASS_HID_b54c = 0xb54c,
-	BNXT_ULP_CLASS_HID_d68c = 0xd68c,
-	BNXT_ULP_CLASS_HID_fbcc = 0xfbcc,
-	BNXT_ULP_CLASS_HID_c80c = 0xc80c,
-	BNXT_ULP_CLASS_HID_ed4c = 0xed4c,
-	BNXT_ULP_CLASS_HID_d350 = 0xd350,
-	BNXT_ULP_CLASS_HID_f490 = 0xf490,
-	BNXT_ULP_CLASS_HID_182d0 = 0x182d0,
-	BNXT_ULP_CLASS_HID_1a410 = 0x1a410,
-	BNXT_ULP_CLASS_HID_1c950 = 0x1c950,
-	BNXT_ULP_CLASS_HID_1ea90 = 0x1ea90,
-	BNXT_ULP_CLASS_HID_1860c = 0x1860c,
-	BNXT_ULP_CLASS_HID_1ab4c = 0x1ab4c,
-	BNXT_ULP_CLASS_HID_1cc8c = 0x1cc8c,
-	BNXT_ULP_CLASS_HID_1f1cc = 0x1f1cc,
-	BNXT_ULP_CLASS_HID_b4b0 = 0xb4b0,
-	BNXT_ULP_CLASS_HID_b9f0 = 0xb9f0,
-	BNXT_ULP_CLASS_HID_fb30 = 0xfb30,
-	BNXT_ULP_CLASS_HID_fc70 = 0xfc70,
-	BNXT_ULP_CLASS_HID_b144 = 0xb144,
-	BNXT_ULP_CLASS_HID_b284 = 0xb284,
-	BNXT_ULP_CLASS_HID_f7c4 = 0xf7c4,
-	BNXT_ULP_CLASS_HID_f904 = 0xf904,
-	BNXT_ULP_CLASS_HID_1a744 = 0x1a744,
-	BNXT_ULP_CLASS_HID_1a884 = 0x1a884,
-	BNXT_ULP_CLASS_HID_1edc4 = 0x1edc4,
-	BNXT_ULP_CLASS_HID_1ef04 = 0x1ef04,
-	BNXT_ULP_CLASS_HID_1aab0 = 0x1aab0,
-	BNXT_ULP_CLASS_HID_1aff0 = 0x1aff0,
-	BNXT_ULP_CLASS_HID_1d130 = 0x1d130,
-	BNXT_ULP_CLASS_HID_1f270 = 0x1f270,
-	BNXT_ULP_CLASS_HID_80e4 = 0x80e4,
-	BNXT_ULP_CLASS_HID_a224 = 0xa224,
-	BNXT_ULP_CLASS_HID_c764 = 0xc764,
-	BNXT_ULP_CLASS_HID_e8a4 = 0xe8a4,
-	BNXT_ULP_CLASS_HID_9da8 = 0x9da8,
-	BNXT_ULP_CLASS_HID_bee8 = 0xbee8,
-	BNXT_ULP_CLASS_HID_c028 = 0xc028,
-	BNXT_ULP_CLASS_HID_e568 = 0xe568,
-	BNXT_ULP_CLASS_HID_1b3a8 = 0x1b3a8,
-	BNXT_ULP_CLASS_HID_1b4e8 = 0x1b4e8,
-	BNXT_ULP_CLASS_HID_1f628 = 0x1f628,
-	BNXT_ULP_CLASS_HID_1fb68 = 0x1fb68,
-	BNXT_ULP_CLASS_HID_1b6e4 = 0x1b6e4,
-	BNXT_ULP_CLASS_HID_1b824 = 0x1b824,
-	BNXT_ULP_CLASS_HID_1fd64 = 0x1fd64,
-	BNXT_ULP_CLASS_HID_1fea4 = 0x1fea4,
-	BNXT_ULP_CLASS_HID_a508 = 0xa508,
-	BNXT_ULP_CLASS_HID_a648 = 0xa648,
-	BNXT_ULP_CLASS_HID_eb88 = 0xeb88,
-	BNXT_ULP_CLASS_HID_ecc8 = 0xecc8,
-	BNXT_ULP_CLASS_HID_a1dc = 0xa1dc,
-	BNXT_ULP_CLASS_HID_a31c = 0xa31c,
-	BNXT_ULP_CLASS_HID_e45c = 0xe45c,
-	BNXT_ULP_CLASS_HID_e99c = 0xe99c,
-	BNXT_ULP_CLASS_HID_1d7dc = 0x1d7dc,
-	BNXT_ULP_CLASS_HID_1f91c = 0x1f91c,
-	BNXT_ULP_CLASS_HID_1da5c = 0x1da5c,
-	BNXT_ULP_CLASS_HID_1ff9c = 0x1ff9c,
-	BNXT_ULP_CLASS_HID_1db08 = 0x1db08,
-	BNXT_ULP_CLASS_HID_1fc48 = 0x1fc48,
-	BNXT_ULP_CLASS_HID_1c188 = 0x1c188,
-	BNXT_ULP_CLASS_HID_1e2c8 = 0x1e2c8,
-	BNXT_ULP_CLASS_HID_9ad8 = 0x9ad8,
-	BNXT_ULP_CLASS_HID_bc18 = 0xbc18,
-	BNXT_ULP_CLASS_HID_c158 = 0xc158,
-	BNXT_ULP_CLASS_HID_e298 = 0xe298,
-	BNXT_ULP_CLASS_HID_97ec = 0x97ec,
-	BNXT_ULP_CLASS_HID_b92c = 0xb92c,
-	BNXT_ULP_CLASS_HID_da6c = 0xda6c,
-	BNXT_ULP_CLASS_HID_ffac = 0xffac,
-	BNXT_ULP_CLASS_HID_18dec = 0x18dec,
-	BNXT_ULP_CLASS_HID_1af2c = 0x1af2c,
-	BNXT_ULP_CLASS_HID_1f06c = 0x1f06c,
-	BNXT_ULP_CLASS_HID_1f5ac = 0x1f5ac,
-	BNXT_ULP_CLASS_HID_1b0d8 = 0x1b0d8,
-	BNXT_ULP_CLASS_HID_1b218 = 0x1b218,
-	BNXT_ULP_CLASS_HID_1f758 = 0x1f758,
-	BNXT_ULP_CLASS_HID_1f898 = 0x1f898,
-	BNXT_ULP_CLASS_HID_bf4c = 0xbf4c,
-	BNXT_ULP_CLASS_HID_a08c = 0xa08c,
-	BNXT_ULP_CLASS_HID_e5cc = 0xe5cc,
-	BNXT_ULP_CLASS_HID_e70c = 0xe70c,
-	BNXT_ULP_CLASS_HID_b810 = 0xb810,
-	BNXT_ULP_CLASS_HID_bd50 = 0xbd50,
-	BNXT_ULP_CLASS_HID_fe90 = 0xfe90,
-	BNXT_ULP_CLASS_HID_e3d0 = 0xe3d0,
-	BNXT_ULP_CLASS_HID_1ae10 = 0x1ae10,
-	BNXT_ULP_CLASS_HID_1f350 = 0x1f350,
-	BNXT_ULP_CLASS_HID_1d490 = 0x1d490,
-	BNXT_ULP_CLASS_HID_1f9d0 = 0x1f9d0,
-	BNXT_ULP_CLASS_HID_1d54c = 0x1d54c,
-	BNXT_ULP_CLASS_HID_1f68c = 0x1f68c,
-	BNXT_ULP_CLASS_HID_1dbcc = 0x1dbcc,
-	BNXT_ULP_CLASS_HID_1fd0c = 0x1fd0c,
-	BNXT_ULP_CLASS_HID_34b0 = 0x34b0,
-	BNXT_ULP_CLASS_HID_3a7c = 0x3a7c,
-	BNXT_ULP_CLASS_HID_3700 = 0x3700,
-	BNXT_ULP_CLASS_HID_5ee0 = 0x5ee0,
-	BNXT_ULP_CLASS_HID_5bb4 = 0x5bb4,
-	BNXT_ULP_CLASS_HID_07d8 = 0x07d8,
-	BNXT_ULP_CLASS_HID_00ec = 0x00ec,
-	BNXT_ULP_CLASS_HID_284c = 0x284c,
-	BNXT_ULP_CLASS_HID_2510 = 0x2510,
-	BNXT_ULP_CLASS_HID_3144 = 0x3144,
-	BNXT_ULP_CLASS_HID_5924 = 0x5924,
-	BNXT_ULP_CLASS_HID_55e8 = 0x55e8,
-	BNXT_ULP_CLASS_HID_1e1c = 0x1e1c,
-	BNXT_ULP_CLASS_HID_1b20 = 0x1b20,
-	BNXT_ULP_CLASS_HID_2280 = 0x2280,
-	BNXT_ULP_CLASS_HID_3f54 = 0x3f54,
+	BNXT_ULP_CLASS_HID_4f0b = 0x4f0b,
+	BNXT_ULP_CLASS_HID_336b = 0x336b,
+	BNXT_ULP_CLASS_HID_39a7 = 0x39a7,
+	BNXT_ULP_CLASS_HID_120b = 0x120b,
+	BNXT_ULP_CLASS_HID_1847 = 0x1847,
+	BNXT_ULP_CLASS_HID_5953 = 0x5953,
+	BNXT_ULP_CLASS_HID_02e3 = 0x02e3,
+	BNXT_ULP_CLASS_HID_35ff = 0x35ff,
+	BNXT_ULP_CLASS_HID_3c3b = 0x3c3b,
+	BNXT_ULP_CLASS_HID_201b = 0x201b,
+	BNXT_ULP_CLASS_HID_2657 = 0x2657,
+	BNXT_ULP_CLASS_HID_2543 = 0x2543,
+	BNXT_ULP_CLASS_HID_2b8f = 0x2b8f,
+	BNXT_ULP_CLASS_HID_0fef = 0x0fef,
+	BNXT_ULP_CLASS_HID_162b = 0x162b,
+	BNXT_ULP_CLASS_HID_48d7 = 0x48d7,
+	BNXT_ULP_CLASS_HID_4f13 = 0x4f13,
+	BNXT_ULP_CLASS_HID_3373 = 0x3373,
+	BNXT_ULP_CLASS_HID_39bf = 0x39bf,
+	BNXT_ULP_CLASS_HID_420b7 = 0x420b7,
+	BNXT_ULP_CLASS_HID_426f3 = 0x426f3,
+	BNXT_ULP_CLASS_HID_40ad3 = 0x40ad3,
+	BNXT_ULP_CLASS_HID_4111f = 0x4111f,
+	BNXT_ULP_CLASS_HID_4441b = 0x4441b,
+	BNXT_ULP_CLASS_HID_44a47 = 0x44a47,
+	BNXT_ULP_CLASS_HID_42ea7 = 0x42ea7,
+	BNXT_ULP_CLASS_HID_434e3 = 0x434e3,
+	BNXT_ULP_CLASS_HID_253b = 0x253b,
+	BNXT_ULP_CLASS_HID_2bf7 = 0x2bf7,
+	BNXT_ULP_CLASS_HID_0f97 = 0x0f97,
+	BNXT_ULP_CLASS_HID_1653 = 0x1653,
+	BNXT_ULP_CLASS_HID_48af = 0x48af,
+	BNXT_ULP_CLASS_HID_4f6b = 0x4f6b,
+	BNXT_ULP_CLASS_HID_330b = 0x330b,
+	BNXT_ULP_CLASS_HID_39c7 = 0x39c7,
+	BNXT_ULP_CLASS_HID_126b = 0x126b,
+	BNXT_ULP_CLASS_HID_1827 = 0x1827,
+	BNXT_ULP_CLASS_HID_5933 = 0x5933,
+	BNXT_ULP_CLASS_HID_0283 = 0x0283,
+	BNXT_ULP_CLASS_HID_359f = 0x359f,
+	BNXT_ULP_CLASS_HID_3c5b = 0x3c5b,
+	BNXT_ULP_CLASS_HID_207b = 0x207b,
+	BNXT_ULP_CLASS_HID_2637 = 0x2637,
+	BNXT_ULP_CLASS_HID_2523 = 0x2523,
+	BNXT_ULP_CLASS_HID_2bef = 0x2bef,
+	BNXT_ULP_CLASS_HID_0f8f = 0x0f8f,
+	BNXT_ULP_CLASS_HID_164b = 0x164b,
+	BNXT_ULP_CLASS_HID_48b7 = 0x48b7,
+	BNXT_ULP_CLASS_HID_4f73 = 0x4f73,
+	BNXT_ULP_CLASS_HID_3313 = 0x3313,
+	BNXT_ULP_CLASS_HID_39df = 0x39df,
+	BNXT_ULP_CLASS_HID_420d7 = 0x420d7,
+	BNXT_ULP_CLASS_HID_42693 = 0x42693,
+	BNXT_ULP_CLASS_HID_40ab3 = 0x40ab3,
+	BNXT_ULP_CLASS_HID_4117f = 0x4117f,
+	BNXT_ULP_CLASS_HID_4447b = 0x4447b,
+	BNXT_ULP_CLASS_HID_44a27 = 0x44a27,
+	BNXT_ULP_CLASS_HID_42ec7 = 0x42ec7,
+	BNXT_ULP_CLASS_HID_43483 = 0x43483,
+	BNXT_ULP_CLASS_HID_4156d = 0x4156d,
+	BNXT_ULP_CLASS_HID_41b29 = 0x41b29,
+	BNXT_ULP_CLASS_HID_52b6d = 0x52b6d,
+	BNXT_ULP_CLASS_HID_53129 = 0x53129,
+	BNXT_ULP_CLASS_HID_478a = 0x478a,
+	BNXT_ULP_CLASS_HID_03a6 = 0x03a6,
+	BNXT_ULP_CLASS_HID_4dce = 0x4dce,
+	BNXT_ULP_CLASS_HID_09ea = 0x09ea,
+	BNXT_ULP_CLASS_HID_08fe = 0x08fe,
+	BNXT_ULP_CLASS_HID_23ce = 0x23ce,
+	BNXT_ULP_CLASS_HID_0e02 = 0x0e02,
+	BNXT_ULP_CLASS_HID_2912 = 0x2912,
+	BNXT_ULP_CLASS_HID_3e2a = 0x3e2a,
+	BNXT_ULP_CLASS_HID_593a = 0x593a,
+	BNXT_ULP_CLASS_HID_246e = 0x246e,
+	BNXT_ULP_CLASS_HID_5f7e = 0x5f7e,
+	BNXT_ULP_CLASS_HID_5e52 = 0x5e52,
+	BNXT_ULP_CLASS_HID_1a6e = 0x1a6e,
+	BNXT_ULP_CLASS_HID_4796 = 0x4796,
+	BNXT_ULP_CLASS_HID_03b2 = 0x03b2,
+	BNXT_ULP_CLASS_HID_4163a = 0x4163a,
+	BNXT_ULP_CLASS_HID_4310a = 0x4310a,
+	BNXT_ULP_CLASS_HID_41c7e = 0x41c7e,
+	BNXT_ULP_CLASS_HID_4374e = 0x4374e,
+	BNXT_ULP_CLASS_HID_42f8e = 0x42f8e,
+	BNXT_ULP_CLASS_HID_4469e = 0x4469e,
+	BNXT_ULP_CLASS_HID_455c2 = 0x455c2,
+	BNXT_ULP_CLASS_HID_411ee = 0x411ee,
+	BNXT_ULP_CLASS_HID_44b76 = 0x44b76,
+	BNXT_ULP_CLASS_HID_40692 = 0x40692,
+	BNXT_ULP_CLASS_HID_415c6 = 0x415c6,
+	BNXT_ULP_CLASS_HID_40cd6 = 0x40cd6,
+	BNXT_ULP_CLASS_HID_42516 = 0x42516,
+	BNXT_ULP_CLASS_HID_45ce6 = 0x45ce6,
+	BNXT_ULP_CLASS_HID_42b2a = 0x42b2a,
+	BNXT_ULP_CLASS_HID_4423a = 0x4423a,
+	BNXT_ULP_CLASS_HID_229d8 = 0x229d8,
+	BNXT_ULP_CLASS_HID_240c8 = 0x240c8,
+	BNXT_ULP_CLASS_HID_22f14 = 0x22f14,
 	BNXT_ULP_CLASS_HID_24604 = 0x24604,
-	BNXT_ULP_CLASS_HID_255d4 = 0x255d4,
-	BNXT_ULP_CLASS_HID_22e08 = 0x22e08,
-	BNXT_ULP_CLASS_HID_24378 = 0x24378,
-	BNXT_ULP_CLASS_HID_20fcc = 0x20fcc,
-	BNXT_ULP_CLASS_HID_21a9c = 0x21a9c,
-	BNXT_ULP_CLASS_HID_217d0 = 0x217d0,
-	BNXT_ULP_CLASS_HID_20800 = 0x20800,
+	BNXT_ULP_CLASS_HID_23374 = 0x23374,
+	BNXT_ULP_CLASS_HID_22a64 = 0x22a64,
+	BNXT_ULP_CLASS_HID_238b0 = 0x238b0,
 	BNXT_ULP_CLASS_HID_253a0 = 0x253a0,
-	BNXT_ULP_CLASS_HID_23f70 = 0x23f70,
-	BNXT_ULP_CLASS_HID_23ba4 = 0x23ba4,
-	BNXT_ULP_CLASS_HID_22c94 = 0x22c94,
-	BNXT_ULP_CLASS_HID_21968 = 0x21968,
-	BNXT_ULP_CLASS_HID_243c4 = 0x243c4,
-	BNXT_ULP_CLASS_HID_25c38 = 0x25c38,
-	BNXT_ULP_CLASS_HID_2125c = 0x2125c,
-	BNXT_ULP_CLASS_HID_240c8 = 0x240c8,
-	BNXT_ULP_CLASS_HID_22f98 = 0x22f98,
-	BNXT_ULP_CLASS_HID_228cc = 0x228cc,
-	BNXT_ULP_CLASS_HID_25d3c = 0x25d3c,
+	BNXT_ULP_CLASS_HID_24dac = 0x24dac,
 	BNXT_ULP_CLASS_HID_20990 = 0x20990,
-	BNXT_ULP_CLASS_HID_214a0 = 0x214a0,
-	BNXT_ULP_CLASS_HID_21194 = 0x21194,
-	BNXT_ULP_CLASS_HID_202c4 = 0x202c4,
-	BNXT_ULP_CLASS_HID_22a64 = 0x22a64,
-	BNXT_ULP_CLASS_HID_23934 = 0x23934,
-	BNXT_ULP_CLASS_HID_23268 = 0x23268,
-	BNXT_ULP_CLASS_HID_22758 = 0x22758,
-	BNXT_ULP_CLASS_HID_2132c = 0x2132c,
-	BNXT_ULP_CLASS_HID_25d88 = 0x25d88,
-	BNXT_ULP_CLASS_HID_256fc = 0x256fc,
-	BNXT_ULP_CLASS_HID_24b2c = 0x24b2c,
-	BNXT_ULP_CLASS_HID_22f14 = 0x22f14,
-	BNXT_ULP_CLASS_HID_23a24 = 0x23a24,
-	BNXT_ULP_CLASS_HID_23718 = 0x23718,
-	BNXT_ULP_CLASS_HID_22848 = 0x22848,
 	BNXT_ULP_CLASS_HID_214dc = 0x214dc,
-	BNXT_ULP_CLASS_HID_25eb8 = 0x25eb8,
-	BNXT_ULP_CLASS_HID_25bec = 0x25bec,
-	BNXT_ULP_CLASS_HID_21110 = 0x21110,
-	BNXT_ULP_CLASS_HID_238b0 = 0x238b0,
-	BNXT_ULP_CLASS_HID_20440 = 0x20440,
-	BNXT_ULP_CLASS_HID_200b4 = 0x200b4,
-	BNXT_ULP_CLASS_HID_235e4 = 0x235e4,
+	BNXT_ULP_CLASS_HID_20fcc = 0x20fcc,
+	BNXT_ULP_CLASS_HID_257c8 = 0x257c8,
+	BNXT_ULP_CLASS_HID_2132c = 0x2132c,
 	BNXT_ULP_CLASS_HID_25d04 = 0x25d04,
-	BNXT_ULP_CLASS_HID_228d4 = 0x228d4,
-	BNXT_ULP_CLASS_HID_22508 = 0x22508,
-	BNXT_ULP_CLASS_HID_25678 = 0x25678,
-	BNXT_ULP_CLASS_HID_229d8 = 0x229d8,
+	BNXT_ULP_CLASS_HID_21968 = 0x21968,
 	BNXT_ULP_CLASS_HID_234e8 = 0x234e8,
-	BNXT_ULP_CLASS_HID_231dc = 0x231dc,
-	BNXT_ULP_CLASS_HID_2220c = 0x2220c,
-	BNXT_ULP_CLASS_HID_24dac = 0x24dac,
-	BNXT_ULP_CLASS_HID_2597c = 0x2597c,
-	BNXT_ULP_CLASS_HID_255b0 = 0x255b0,
-	BNXT_ULP_CLASS_HID_246e0 = 0x246e0,
-	BNXT_ULP_CLASS_HID_23374 = 0x23374,
+	BNXT_ULP_CLASS_HID_22f98 = 0x22f98,
+	BNXT_ULP_CLASS_HID_23a24 = 0x23a24,
+	BNXT_ULP_CLASS_HID_255d4 = 0x255d4,
 	BNXT_ULP_CLASS_HID_21e04 = 0x21e04,
-	BNXT_ULP_CLASS_HID_21b78 = 0x21b78,
-	BNXT_ULP_CLASS_HID_20fa8 = 0x20fa8,
-	BNXT_ULP_CLASS_HID_257c8 = 0x257c8,
+	BNXT_ULP_CLASS_HID_23934 = 0x23934,
+	BNXT_ULP_CLASS_HID_20440 = 0x20440,
+	BNXT_ULP_CLASS_HID_23f70 = 0x23f70,
+	BNXT_ULP_CLASS_HID_2597c = 0x2597c,
+	BNXT_ULP_CLASS_HID_214a0 = 0x214a0,
+	BNXT_ULP_CLASS_HID_25eb8 = 0x25eb8,
+	BNXT_ULP_CLASS_HID_21a9c = 0x21a9c,
 	BNXT_ULP_CLASS_HID_22298 = 0x22298,
-	BNXT_ULP_CLASS_HID_23fcc = 0x23fcc,
-	BNXT_ULP_CLASS_HID_2503c = 0x2503c,
-	BNXT_ULP_CLASS_HID_2239c = 0x2239c,
-	BNXT_ULP_CLASS_HID_20eac = 0x20eac,
-	BNXT_ULP_CLASS_HID_20be0 = 0x20be0,
-	BNXT_ULP_CLASS_HID_23cd0 = 0x23cd0,
-	BNXT_ULP_CLASS_HID_24470 = 0x24470,
-	BNXT_ULP_CLASS_HID_25300 = 0x25300,
-	BNXT_ULP_CLASS_HID_22c74 = 0x22c74,
-	BNXT_ULP_CLASS_HID_240a4 = 0x240a4,
-	BNXT_ULP_CLASS_HID_23da0 = 0x23da0,
-	BNXT_ULP_CLASS_HID_20970 = 0x20970,
-	BNXT_ULP_CLASS_HID_205a4 = 0x205a4,
-	BNXT_ULP_CLASS_HID_23694 = 0x23694,
-	BNXT_ULP_CLASS_HID_25e34 = 0x25e34,
-	BNXT_ULP_CLASS_HID_22dc4 = 0x22dc4,
-	BNXT_ULP_CLASS_HID_22638 = 0x22638,
-	BNXT_ULP_CLASS_HID_25b68 = 0x25b68,
-	BNXT_ULP_CLASS_HID_34c8 = 0x34c8,
-	BNXT_ULP_CLASS_HID_3a04 = 0x3a04,
-	BNXT_ULP_CLASS_HID_09d4 = 0x09d4,
-	BNXT_ULP_CLASS_HID_5e98 = 0x5e98,
-	BNXT_ULP_CLASS_HID_2da8 = 0x2da8,
-	BNXT_ULP_CLASS_HID_07a0 = 0x07a0,
-	BNXT_ULP_CLASS_HID_1370 = 0x1370,
-	BNXT_ULP_CLASS_HID_2834 = 0x2834,
-	BNXT_ULP_CLASS_HID_37c4 = 0x37c4,
-	BNXT_ULP_CLASS_HID_0398 = 0x0398,
-	BNXT_ULP_CLASS_HID_595c = 0x595c,
-	BNXT_ULP_CLASS_HID_246c = 0x246c,
-	BNXT_ULP_CLASS_HID_1e64 = 0x1e64,
-	BNXT_ULP_CLASS_HID_48c0 = 0x48c0,
-	BNXT_ULP_CLASS_HID_22f8 = 0x22f8,
-	BNXT_ULP_CLASS_HID_3188 = 0x3188,
-	BNXT_ULP_CLASS_HID_24664 = 0x24664,
-	BNXT_ULP_CLASS_HID_29418 = 0x29418,
-	BNXT_ULP_CLASS_HID_30118 = 0x30118,
-	BNXT_ULP_CLASS_HID_38a18 = 0x38a18,
-	BNXT_ULP_CLASS_HID_255b4 = 0x255b4,
-	BNXT_ULP_CLASS_HID_2deb4 = 0x2deb4,
-	BNXT_ULP_CLASS_HID_34bb4 = 0x34bb4,
-	BNXT_ULP_CLASS_HID_39968 = 0x39968,
-	BNXT_ULP_CLASS_HID_22e68 = 0x22e68,
-	BNXT_ULP_CLASS_HID_2db68 = 0x2db68,
-	BNXT_ULP_CLASS_HID_34468 = 0x34468,
-	BNXT_ULP_CLASS_HID_3921c = 0x3921c,
-	BNXT_ULP_CLASS_HID_24318 = 0x24318,
-	BNXT_ULP_CLASS_HID_290cc = 0x290cc,
-	BNXT_ULP_CLASS_HID_31dcc = 0x31dcc,
-	BNXT_ULP_CLASS_HID_386cc = 0x386cc,
-	BNXT_ULP_CLASS_HID_20fac = 0x20fac,
-	BNXT_ULP_CLASS_HID_2b8ac = 0x2b8ac,
-	BNXT_ULP_CLASS_HID_325ac = 0x325ac,
-	BNXT_ULP_CLASS_HID_3aeac = 0x3aeac,
-	BNXT_ULP_CLASS_HID_21afc = 0x21afc,
-	BNXT_ULP_CLASS_HID_287fc = 0x287fc,
-	BNXT_ULP_CLASS_HID_330fc = 0x330fc,
-	BNXT_ULP_CLASS_HID_3bdfc = 0x3bdfc,
-	BNXT_ULP_CLASS_HID_217b0 = 0x217b0,
-	BNXT_ULP_CLASS_HID_280b0 = 0x280b0,
-	BNXT_ULP_CLASS_HID_30db0 = 0x30db0,
-	BNXT_ULP_CLASS_HID_3b6b0 = 0x3b6b0,
-	BNXT_ULP_CLASS_HID_20860 = 0x20860,
-	BNXT_ULP_CLASS_HID_2b560 = 0x2b560,
-	BNXT_ULP_CLASS_HID_33e60 = 0x33e60,
-	BNXT_ULP_CLASS_HID_3ab60 = 0x3ab60,
-	BNXT_ULP_CLASS_HID_253c0 = 0x253c0,
-	BNXT_ULP_CLASS_HID_2dcc0 = 0x2dcc0,
-	BNXT_ULP_CLASS_HID_349c0 = 0x349c0,
-	BNXT_ULP_CLASS_HID_397f4 = 0x397f4,
-	BNXT_ULP_CLASS_HID_23f10 = 0x23f10,
-	BNXT_ULP_CLASS_HID_2a810 = 0x2a810,
-	BNXT_ULP_CLASS_HID_35510 = 0x35510,
-	BNXT_ULP_CLASS_HID_3de10 = 0x3de10,
-	BNXT_ULP_CLASS_HID_23bc4 = 0x23bc4,
-	BNXT_ULP_CLASS_HID_2a4c4 = 0x2a4c4,
-	BNXT_ULP_CLASS_HID_351c4 = 0x351c4,
-	BNXT_ULP_CLASS_HID_3dac4 = 0x3dac4,
-	BNXT_ULP_CLASS_HID_22cf4 = 0x22cf4,
-	BNXT_ULP_CLASS_HID_2d9f4 = 0x2d9f4,
-	BNXT_ULP_CLASS_HID_342f4 = 0x342f4,
-	BNXT_ULP_CLASS_HID_390a8 = 0x390a8,
-	BNXT_ULP_CLASS_HID_21908 = 0x21908,
-	BNXT_ULP_CLASS_HID_28208 = 0x28208,
-	BNXT_ULP_CLASS_HID_30f08 = 0x30f08,
-	BNXT_ULP_CLASS_HID_3b808 = 0x3b808,
-	BNXT_ULP_CLASS_HID_243a4 = 0x243a4,
-	BNXT_ULP_CLASS_HID_29158 = 0x29158,
-	BNXT_ULP_CLASS_HID_31a58 = 0x31a58,
-	BNXT_ULP_CLASS_HID_38758 = 0x38758,
-	BNXT_ULP_CLASS_HID_25c58 = 0x25c58,
-	BNXT_ULP_CLASS_HID_2c958 = 0x2c958,
-	BNXT_ULP_CLASS_HID_3170c = 0x3170c,
-	BNXT_ULP_CLASS_HID_3800c = 0x3800c,
-	BNXT_ULP_CLASS_HID_2123c = 0x2123c,
-	BNXT_ULP_CLASS_HID_29f3c = 0x29f3c,
-	BNXT_ULP_CLASS_HID_3083c = 0x3083c,
-	BNXT_ULP_CLASS_HID_3b53c = 0x3b53c,
+	BNXT_ULP_CLASS_HID_25d88 = 0x25d88,
+	BNXT_ULP_CLASS_HID_228d4 = 0x228d4,
+	BNXT_ULP_CLASS_HID_243c4 = 0x243c4,
+	BNXT_ULP_CLASS_HID_6220c = 0x6220c,
+	BNXT_ULP_CLASS_HID_65d3c = 0x65d3c,
+	BNXT_ULP_CLASS_HID_62848 = 0x62848,
+	BNXT_ULP_CLASS_HID_64378 = 0x64378,
+	BNXT_ULP_CLASS_HID_60fa8 = 0x60fa8,
+	BNXT_ULP_CLASS_HID_62758 = 0x62758,
+	BNXT_ULP_CLASS_HID_635e4 = 0x635e4,
+	BNXT_ULP_CLASS_HID_62c94 = 0x62c94,
+	BNXT_ULP_CLASS_HID_646e0 = 0x646e0,
+	BNXT_ULP_CLASS_HID_602c4 = 0x602c4,
+	BNXT_ULP_CLASS_HID_61110 = 0x61110,
+	BNXT_ULP_CLASS_HID_60800 = 0x60800,
+	BNXT_ULP_CLASS_HID_6503c = 0x6503c,
+	BNXT_ULP_CLASS_HID_64b2c = 0x64b2c,
+	BNXT_ULP_CLASS_HID_65678 = 0x65678,
+	BNXT_ULP_CLASS_HID_6125c = 0x6125c,
+	BNXT_ULP_CLASS_HID_631dc = 0x631dc,
+	BNXT_ULP_CLASS_HID_628cc = 0x628cc,
+	BNXT_ULP_CLASS_HID_63718 = 0x63718,
+	BNXT_ULP_CLASS_HID_62e08 = 0x62e08,
+	BNXT_ULP_CLASS_HID_61b78 = 0x61b78,
+	BNXT_ULP_CLASS_HID_63268 = 0x63268,
+	BNXT_ULP_CLASS_HID_600b4 = 0x600b4,
+	BNXT_ULP_CLASS_HID_63ba4 = 0x63ba4,
+	BNXT_ULP_CLASS_HID_655b0 = 0x655b0,
+	BNXT_ULP_CLASS_HID_61194 = 0x61194,
+	BNXT_ULP_CLASS_HID_65bec = 0x65bec,
+	BNXT_ULP_CLASS_HID_617d0 = 0x617d0,
+	BNXT_ULP_CLASS_HID_63fcc = 0x63fcc,
+	BNXT_ULP_CLASS_HID_656fc = 0x656fc,
+	BNXT_ULP_CLASS_HID_62508 = 0x62508,
+	BNXT_ULP_CLASS_HID_65c38 = 0x65c38,
+	BNXT_ULP_CLASS_HID_86e0 = 0x86e0,
+	BNXT_ULP_CLASS_HID_a1f0 = 0xa1f0,
+	BNXT_ULP_CLASS_HID_8c2c = 0x8c2c,
+	BNXT_ULP_CLASS_HID_a73c = 0xa73c,
+	BNXT_ULP_CLASS_HID_904c = 0x904c,
+	BNXT_ULP_CLASS_HID_8b5c = 0x8b5c,
+	BNXT_ULP_CLASS_HID_9988 = 0x9988,
+	BNXT_ULP_CLASS_HID_b098 = 0xb098,
+	BNXT_ULP_CLASS_HID_aa94 = 0xaa94,
+	BNXT_ULP_CLASS_HID_c264 = 0xc264,
+	BNXT_ULP_CLASS_HID_d0d0 = 0xd0d0,
+	BNXT_ULP_CLASS_HID_cba0 = 0xcba0,
+	BNXT_ULP_CLASS_HID_b4f0 = 0xb4f0,
+	BNXT_ULP_CLASS_HID_afc0 = 0xafc0,
+	BNXT_ULP_CLASS_HID_ba3c = 0xba3c,
+	BNXT_ULP_CLASS_HID_d50c = 0xd50c,
+	BNXT_ULP_CLASS_HID_48334 = 0x48334,
+	BNXT_ULP_CLASS_HID_4ba04 = 0x4ba04,
+	BNXT_ULP_CLASS_HID_48970 = 0x48970,
+	BNXT_ULP_CLASS_HID_4a040 = 0x4a040,
+	BNXT_ULP_CLASS_HID_4c84c = 0x4c84c,
+	BNXT_ULP_CLASS_HID_48460 = 0x48460,
+	BNXT_ULP_CLASS_HID_492dc = 0x492dc,
+	BNXT_ULP_CLASS_HID_48dac = 0x48dac,
+	BNXT_ULP_CLASS_HID_4a7d8 = 0x4a7d8,
+	BNXT_ULP_CLASS_HID_4dea8 = 0x4dea8,
+	BNXT_ULP_CLASS_HID_4ade4 = 0x4ade4,
+	BNXT_ULP_CLASS_HID_4c4f4 = 0x4c4f4,
+	BNXT_ULP_CLASS_HID_4b104 = 0x4b104,
+	BNXT_ULP_CLASS_HID_4a814 = 0x4a814,
+	BNXT_ULP_CLASS_HID_4b740 = 0x4b740,
+	BNXT_ULP_CLASS_HID_4ae50 = 0x4ae50,
+	BNXT_ULP_CLASS_HID_1bce0 = 0x1bce0,
+	BNXT_ULP_CLASS_HID_1d7f0 = 0x1d7f0,
+	BNXT_ULP_CLASS_HID_1a22c = 0x1a22c,
+	BNXT_ULP_CLASS_HID_1dd3c = 0x1dd3c,
+	BNXT_ULP_CLASS_HID_1864c = 0x1864c,
+	BNXT_ULP_CLASS_HID_1a15c = 0x1a15c,
+	BNXT_ULP_CLASS_HID_18f88 = 0x18f88,
+	BNXT_ULP_CLASS_HID_1a698 = 0x1a698,
+	BNXT_ULP_CLASS_HID_1c094 = 0x1c094,
+	BNXT_ULP_CLASS_HID_19ca8 = 0x19ca8,
+	BNXT_ULP_CLASS_HID_1c6d0 = 0x1c6d0,
+	BNXT_ULP_CLASS_HID_182f4 = 0x182f4,
+	BNXT_ULP_CLASS_HID_1aaf0 = 0x1aaf0,
+	BNXT_ULP_CLASS_HID_1c5c0 = 0x1c5c0,
+	BNXT_ULP_CLASS_HID_1d03c = 0x1d03c,
+	BNXT_ULP_CLASS_HID_1cb0c = 0x1cb0c,
+	BNXT_ULP_CLASS_HID_5b934 = 0x5b934,
+	BNXT_ULP_CLASS_HID_5d004 = 0x5d004,
+	BNXT_ULP_CLASS_HID_5bf70 = 0x5bf70,
+	BNXT_ULP_CLASS_HID_5d640 = 0x5d640,
+	BNXT_ULP_CLASS_HID_58290 = 0x58290,
+	BNXT_ULP_CLASS_HID_5ba60 = 0x5ba60,
+	BNXT_ULP_CLASS_HID_588dc = 0x588dc,
+	BNXT_ULP_CLASS_HID_5a3ac = 0x5a3ac,
+	BNXT_ULP_CLASS_HID_5ddd8 = 0x5ddd8,
+	BNXT_ULP_CLASS_HID_599fc = 0x599fc,
+	BNXT_ULP_CLASS_HID_5c3e4 = 0x5c3e4,
+	BNXT_ULP_CLASS_HID_59f38 = 0x59f38,
+	BNXT_ULP_CLASS_HID_5a704 = 0x5a704,
+	BNXT_ULP_CLASS_HID_5de14 = 0x5de14,
+	BNXT_ULP_CLASS_HID_5ad40 = 0x5ad40,
+	BNXT_ULP_CLASS_HID_5c450 = 0x5c450,
+	BNXT_ULP_CLASS_HID_47aa = 0x47aa,
+	BNXT_ULP_CLASS_HID_0386 = 0x0386,
+	BNXT_ULP_CLASS_HID_4dee = 0x4dee,
+	BNXT_ULP_CLASS_HID_09ca = 0x09ca,
+	BNXT_ULP_CLASS_HID_08de = 0x08de,
+	BNXT_ULP_CLASS_HID_23ee = 0x23ee,
+	BNXT_ULP_CLASS_HID_0e22 = 0x0e22,
+	BNXT_ULP_CLASS_HID_2932 = 0x2932,
+	BNXT_ULP_CLASS_HID_3e0a = 0x3e0a,
+	BNXT_ULP_CLASS_HID_591a = 0x591a,
+	BNXT_ULP_CLASS_HID_244e = 0x244e,
+	BNXT_ULP_CLASS_HID_5f5e = 0x5f5e,
+	BNXT_ULP_CLASS_HID_5e72 = 0x5e72,
+	BNXT_ULP_CLASS_HID_1a4e = 0x1a4e,
+	BNXT_ULP_CLASS_HID_47b6 = 0x47b6,
+	BNXT_ULP_CLASS_HID_0392 = 0x0392,
+	BNXT_ULP_CLASS_HID_5dc2 = 0x5dc2,
+	BNXT_ULP_CLASS_HID_191e = 0x191e,
+	BNXT_ULP_CLASS_HID_4306 = 0x4306,
+	BNXT_ULP_CLASS_HID_1f62 = 0x1f62,
+	BNXT_ULP_CLASS_HID_1e76 = 0x1e76,
+	BNXT_ULP_CLASS_HID_3906 = 0x3906,
+	BNXT_ULP_CLASS_HID_07ba = 0x07ba,
+	BNXT_ULP_CLASS_HID_3f4a = 0x3f4a,
+	BNXT_ULP_CLASS_HID_37a2 = 0x37a2,
+	BNXT_ULP_CLASS_HID_2eb2 = 0x2eb2,
+	BNXT_ULP_CLASS_HID_3de6 = 0x3de6,
+	BNXT_ULP_CLASS_HID_54f6 = 0x54f6,
+	BNXT_ULP_CLASS_HID_578a = 0x578a,
+	BNXT_ULP_CLASS_HID_13e6 = 0x13e6,
+	BNXT_ULP_CLASS_HID_5dce = 0x5dce,
+	BNXT_ULP_CLASS_HID_192a = 0x192a,
+	BNXT_ULP_CLASS_HID_440f6 = 0x440f6,
+	BNXT_ULP_CLASS_HID_41cd2 = 0x41cd2,
+	BNXT_ULP_CLASS_HID_4463a = 0x4463a,
+	BNXT_ULP_CLASS_HID_40216 = 0x40216,
+	BNXT_ULP_CLASS_HID_4052a = 0x4052a,
+	BNXT_ULP_CLASS_HID_43c3a = 0x43c3a,
+	BNXT_ULP_CLASS_HID_40b6e = 0x40b6e,
+	BNXT_ULP_CLASS_HID_4227e = 0x4227e,
+	BNXT_ULP_CLASS_HID_43b56 = 0x43b56,
+	BNXT_ULP_CLASS_HID_45266 = 0x45266,
+	BNXT_ULP_CLASS_HID_4209a = 0x4209a,
+	BNXT_ULP_CLASS_HID_45baa = 0x45baa,
+	BNXT_ULP_CLASS_HID_45abe = 0x45abe,
+	BNXT_ULP_CLASS_HID_4169a = 0x4169a,
+	BNXT_ULP_CLASS_HID_44082 = 0x44082,
+	BNXT_ULP_CLASS_HID_41cde = 0x41cde,
+	BNXT_ULP_CLASS_HID_4560e = 0x4560e,
+	BNXT_ULP_CLASS_HID_4126a = 0x4126a,
+	BNXT_ULP_CLASS_HID_45c52 = 0x45c52,
+	BNXT_ULP_CLASS_HID_41bae = 0x41bae,
+	BNXT_ULP_CLASS_HID_41b42 = 0x41b42,
+	BNXT_ULP_CLASS_HID_43252 = 0x43252,
+	BNXT_ULP_CLASS_HID_40086 = 0x40086,
+	BNXT_ULP_CLASS_HID_43b96 = 0x43b96,
+	BNXT_ULP_CLASS_HID_430ee = 0x430ee,
+	BNXT_ULP_CLASS_HID_42bfe = 0x42bfe,
+	BNXT_ULP_CLASS_HID_43632 = 0x43632,
+	BNXT_ULP_CLASS_HID_451c2 = 0x451c2,
+	BNXT_ULP_CLASS_HID_450d6 = 0x450d6,
+	BNXT_ULP_CLASS_HID_44be6 = 0x44be6,
+	BNXT_ULP_CLASS_HID_4561a = 0x4561a,
+	BNXT_ULP_CLASS_HID_41276 = 0x41276,
+	BNXT_ULP_CLASS_HID_4161a = 0x4161a,
+	BNXT_ULP_CLASS_HID_4312a = 0x4312a,
+	BNXT_ULP_CLASS_HID_41c5e = 0x41c5e,
+	BNXT_ULP_CLASS_HID_4376e = 0x4376e,
+	BNXT_ULP_CLASS_HID_42fae = 0x42fae,
+	BNXT_ULP_CLASS_HID_446be = 0x446be,
+	BNXT_ULP_CLASS_HID_455e2 = 0x455e2,
+	BNXT_ULP_CLASS_HID_411ce = 0x411ce,
+	BNXT_ULP_CLASS_HID_44b56 = 0x44b56,
+	BNXT_ULP_CLASS_HID_406b2 = 0x406b2,
+	BNXT_ULP_CLASS_HID_415e6 = 0x415e6,
+	BNXT_ULP_CLASS_HID_40cf6 = 0x40cf6,
+	BNXT_ULP_CLASS_HID_42536 = 0x42536,
+	BNXT_ULP_CLASS_HID_45cc6 = 0x45cc6,
+	BNXT_ULP_CLASS_HID_42b0a = 0x42b0a,
+	BNXT_ULP_CLASS_HID_4421a = 0x4421a,
+	BNXT_ULP_CLASS_HID_6221a = 0x6221a,
+	BNXT_ULP_CLASS_HID_65d2a = 0x65d2a,
+	BNXT_ULP_CLASS_HID_6285e = 0x6285e,
+	BNXT_ULP_CLASS_HID_6436e = 0x6436e,
+	BNXT_ULP_CLASS_HID_61cfa = 0x61cfa,
+	BNXT_ULP_CLASS_HID_6378a = 0x6378a,
+	BNXT_ULP_CLASS_HID_6023e = 0x6023e,
+	BNXT_ULP_CLASS_HID_63dce = 0x63dce,
+	BNXT_ULP_CLASS_HID_63ba2 = 0x63ba2,
+	BNXT_ULP_CLASS_HID_652b2 = 0x652b2,
+	BNXT_ULP_CLASS_HID_621e6 = 0x621e6,
+	BNXT_ULP_CLASS_HID_658f6 = 0x658f6,
+	BNXT_ULP_CLASS_HID_61202 = 0x61202,
+	BNXT_ULP_CLASS_HID_60d12 = 0x60d12,
+	BNXT_ULP_CLASS_HID_61846 = 0x61846,
+	BNXT_ULP_CLASS_HID_63356 = 0x63356,
+	BNXT_ULP_CLASS_HID_50c1a = 0x50c1a,
+	BNXT_ULP_CLASS_HID_5272a = 0x5272a,
+	BNXT_ULP_CLASS_HID_5325e = 0x5325e,
+	BNXT_ULP_CLASS_HID_52d6e = 0x52d6e,
+	BNXT_ULP_CLASS_HID_545ae = 0x545ae,
+	BNXT_ULP_CLASS_HID_5018a = 0x5018a,
+	BNXT_ULP_CLASS_HID_54be2 = 0x54be2,
+	BNXT_ULP_CLASS_HID_507ce = 0x507ce,
+	BNXT_ULP_CLASS_HID_505a2 = 0x505a2,
+	BNXT_ULP_CLASS_HID_53cb2 = 0x53cb2,
+	BNXT_ULP_CLASS_HID_50be6 = 0x50be6,
+	BNXT_ULP_CLASS_HID_522f6 = 0x522f6,
+	BNXT_ULP_CLASS_HID_55b36 = 0x55b36,
+	BNXT_ULP_CLASS_HID_51712 = 0x51712,
+	BNXT_ULP_CLASS_HID_5410a = 0x5410a,
+	BNXT_ULP_CLASS_HID_51d56 = 0x51d56,
+	BNXT_ULP_CLASS_HID_7581a = 0x7581a,
+	BNXT_ULP_CLASS_HID_71466 = 0x71466,
+	BNXT_ULP_CLASS_HID_75e5e = 0x75e5e,
+	BNXT_ULP_CLASS_HID_71dba = 0x71dba,
+	BNXT_ULP_CLASS_HID_732fa = 0x732fa,
+	BNXT_ULP_CLASS_HID_72d8a = 0x72d8a,
+	BNXT_ULP_CLASS_HID_7383e = 0x7383e,
+	BNXT_ULP_CLASS_HID_753ce = 0x753ce,
+	BNXT_ULP_CLASS_HID_751a2 = 0x751a2,
+	BNXT_ULP_CLASS_HID_748b2 = 0x748b2,
+	BNXT_ULP_CLASS_HID_757e6 = 0x757e6,
+	BNXT_ULP_CLASS_HID_713c2 = 0x713c2,
+	BNXT_ULP_CLASS_HID_70802 = 0x70802,
+	BNXT_ULP_CLASS_HID_72312 = 0x72312,
+	BNXT_ULP_CLASS_HID_70e46 = 0x70e46,
+	BNXT_ULP_CLASS_HID_72956 = 0x72956,
+	BNXT_ULP_CLASS_HID_47ca = 0x47ca,
+	BNXT_ULP_CLASS_HID_03e6 = 0x03e6,
+	BNXT_ULP_CLASS_HID_4d8e = 0x4d8e,
+	BNXT_ULP_CLASS_HID_09aa = 0x09aa,
+	BNXT_ULP_CLASS_HID_08be = 0x08be,
+	BNXT_ULP_CLASS_HID_238e = 0x238e,
+	BNXT_ULP_CLASS_HID_0e42 = 0x0e42,
+	BNXT_ULP_CLASS_HID_2952 = 0x2952,
+	BNXT_ULP_CLASS_HID_3e6a = 0x3e6a,
+	BNXT_ULP_CLASS_HID_597a = 0x597a,
+	BNXT_ULP_CLASS_HID_242e = 0x242e,
+	BNXT_ULP_CLASS_HID_5f3e = 0x5f3e,
+	BNXT_ULP_CLASS_HID_5e12 = 0x5e12,
+	BNXT_ULP_CLASS_HID_1a2e = 0x1a2e,
+	BNXT_ULP_CLASS_HID_47d6 = 0x47d6,
+	BNXT_ULP_CLASS_HID_03f2 = 0x03f2,
+	BNXT_ULP_CLASS_HID_5da2 = 0x5da2,
+	BNXT_ULP_CLASS_HID_197e = 0x197e,
+	BNXT_ULP_CLASS_HID_4366 = 0x4366,
+	BNXT_ULP_CLASS_HID_1f02 = 0x1f02,
+	BNXT_ULP_CLASS_HID_1e16 = 0x1e16,
+	BNXT_ULP_CLASS_HID_3966 = 0x3966,
+	BNXT_ULP_CLASS_HID_07da = 0x07da,
+	BNXT_ULP_CLASS_HID_3f2a = 0x3f2a,
+	BNXT_ULP_CLASS_HID_37c2 = 0x37c2,
+	BNXT_ULP_CLASS_HID_2ed2 = 0x2ed2,
+	BNXT_ULP_CLASS_HID_3d86 = 0x3d86,
+	BNXT_ULP_CLASS_HID_5496 = 0x5496,
+	BNXT_ULP_CLASS_HID_57ea = 0x57ea,
+	BNXT_ULP_CLASS_HID_1386 = 0x1386,
+	BNXT_ULP_CLASS_HID_5dae = 0x5dae,
+	BNXT_ULP_CLASS_HID_194a = 0x194a,
+	BNXT_ULP_CLASS_HID_44096 = 0x44096,
+	BNXT_ULP_CLASS_HID_41cb2 = 0x41cb2,
+	BNXT_ULP_CLASS_HID_4465a = 0x4465a,
+	BNXT_ULP_CLASS_HID_40276 = 0x40276,
+	BNXT_ULP_CLASS_HID_4054a = 0x4054a,
+	BNXT_ULP_CLASS_HID_43c5a = 0x43c5a,
+	BNXT_ULP_CLASS_HID_40b0e = 0x40b0e,
+	BNXT_ULP_CLASS_HID_4221e = 0x4221e,
+	BNXT_ULP_CLASS_HID_43b36 = 0x43b36,
+	BNXT_ULP_CLASS_HID_45206 = 0x45206,
+	BNXT_ULP_CLASS_HID_420fa = 0x420fa,
+	BNXT_ULP_CLASS_HID_45bca = 0x45bca,
+	BNXT_ULP_CLASS_HID_45ade = 0x45ade,
+	BNXT_ULP_CLASS_HID_416fa = 0x416fa,
+	BNXT_ULP_CLASS_HID_440e2 = 0x440e2,
+	BNXT_ULP_CLASS_HID_41cbe = 0x41cbe,
+	BNXT_ULP_CLASS_HID_4566e = 0x4566e,
+	BNXT_ULP_CLASS_HID_4120a = 0x4120a,
+	BNXT_ULP_CLASS_HID_45c32 = 0x45c32,
+	BNXT_ULP_CLASS_HID_41bce = 0x41bce,
+	BNXT_ULP_CLASS_HID_41b22 = 0x41b22,
+	BNXT_ULP_CLASS_HID_43232 = 0x43232,
+	BNXT_ULP_CLASS_HID_400e6 = 0x400e6,
+	BNXT_ULP_CLASS_HID_43bf6 = 0x43bf6,
+	BNXT_ULP_CLASS_HID_4308e = 0x4308e,
+	BNXT_ULP_CLASS_HID_42b9e = 0x42b9e,
+	BNXT_ULP_CLASS_HID_43652 = 0x43652,
+	BNXT_ULP_CLASS_HID_451a2 = 0x451a2,
+	BNXT_ULP_CLASS_HID_450b6 = 0x450b6,
+	BNXT_ULP_CLASS_HID_44b86 = 0x44b86,
+	BNXT_ULP_CLASS_HID_4567a = 0x4567a,
+	BNXT_ULP_CLASS_HID_41216 = 0x41216,
+	BNXT_ULP_CLASS_HID_4167a = 0x4167a,
+	BNXT_ULP_CLASS_HID_4314a = 0x4314a,
+	BNXT_ULP_CLASS_HID_41c3e = 0x41c3e,
+	BNXT_ULP_CLASS_HID_4370e = 0x4370e,
+	BNXT_ULP_CLASS_HID_42fce = 0x42fce,
+	BNXT_ULP_CLASS_HID_446de = 0x446de,
+	BNXT_ULP_CLASS_HID_45582 = 0x45582,
+	BNXT_ULP_CLASS_HID_411ae = 0x411ae,
+	BNXT_ULP_CLASS_HID_44b36 = 0x44b36,
+	BNXT_ULP_CLASS_HID_406d2 = 0x406d2,
+	BNXT_ULP_CLASS_HID_41586 = 0x41586,
+	BNXT_ULP_CLASS_HID_40c96 = 0x40c96,
+	BNXT_ULP_CLASS_HID_42556 = 0x42556,
+	BNXT_ULP_CLASS_HID_45ca6 = 0x45ca6,
+	BNXT_ULP_CLASS_HID_42b6a = 0x42b6a,
+	BNXT_ULP_CLASS_HID_4427a = 0x4427a,
+	BNXT_ULP_CLASS_HID_6227a = 0x6227a,
+	BNXT_ULP_CLASS_HID_65d4a = 0x65d4a,
+	BNXT_ULP_CLASS_HID_6283e = 0x6283e,
+	BNXT_ULP_CLASS_HID_6430e = 0x6430e,
+	BNXT_ULP_CLASS_HID_61c9a = 0x61c9a,
+	BNXT_ULP_CLASS_HID_637ea = 0x637ea,
+	BNXT_ULP_CLASS_HID_6025e = 0x6025e,
+	BNXT_ULP_CLASS_HID_63dae = 0x63dae,
+	BNXT_ULP_CLASS_HID_63bc2 = 0x63bc2,
+	BNXT_ULP_CLASS_HID_652d2 = 0x652d2,
+	BNXT_ULP_CLASS_HID_62186 = 0x62186,
+	BNXT_ULP_CLASS_HID_65896 = 0x65896,
+	BNXT_ULP_CLASS_HID_61262 = 0x61262,
+	BNXT_ULP_CLASS_HID_60d72 = 0x60d72,
+	BNXT_ULP_CLASS_HID_61826 = 0x61826,
+	BNXT_ULP_CLASS_HID_63336 = 0x63336,
+	BNXT_ULP_CLASS_HID_50c7a = 0x50c7a,
+	BNXT_ULP_CLASS_HID_5274a = 0x5274a,
+	BNXT_ULP_CLASS_HID_5323e = 0x5323e,
+	BNXT_ULP_CLASS_HID_52d0e = 0x52d0e,
+	BNXT_ULP_CLASS_HID_545ce = 0x545ce,
+	BNXT_ULP_CLASS_HID_501ea = 0x501ea,
+	BNXT_ULP_CLASS_HID_54b82 = 0x54b82,
+	BNXT_ULP_CLASS_HID_507ae = 0x507ae,
+	BNXT_ULP_CLASS_HID_505c2 = 0x505c2,
+	BNXT_ULP_CLASS_HID_53cd2 = 0x53cd2,
+	BNXT_ULP_CLASS_HID_50b86 = 0x50b86,
+	BNXT_ULP_CLASS_HID_52296 = 0x52296,
+	BNXT_ULP_CLASS_HID_55b56 = 0x55b56,
+	BNXT_ULP_CLASS_HID_51772 = 0x51772,
+	BNXT_ULP_CLASS_HID_5416a = 0x5416a,
+	BNXT_ULP_CLASS_HID_51d36 = 0x51d36,
+	BNXT_ULP_CLASS_HID_7587a = 0x7587a,
+	BNXT_ULP_CLASS_HID_71406 = 0x71406,
+	BNXT_ULP_CLASS_HID_75e3e = 0x75e3e,
+	BNXT_ULP_CLASS_HID_71dda = 0x71dda,
+	BNXT_ULP_CLASS_HID_7329a = 0x7329a,
+	BNXT_ULP_CLASS_HID_72dea = 0x72dea,
+	BNXT_ULP_CLASS_HID_7385e = 0x7385e,
+	BNXT_ULP_CLASS_HID_753ae = 0x753ae,
+	BNXT_ULP_CLASS_HID_751c2 = 0x751c2,
+	BNXT_ULP_CLASS_HID_748d2 = 0x748d2,
+	BNXT_ULP_CLASS_HID_75786 = 0x75786,
+	BNXT_ULP_CLASS_HID_713a2 = 0x713a2,
+	BNXT_ULP_CLASS_HID_70862 = 0x70862,
+	BNXT_ULP_CLASS_HID_72372 = 0x72372,
+	BNXT_ULP_CLASS_HID_70e26 = 0x70e26,
+	BNXT_ULP_CLASS_HID_72936 = 0x72936,
+	BNXT_ULP_CLASS_HID_229b8 = 0x229b8,
 	BNXT_ULP_CLASS_HID_240a8 = 0x240a8,
-	BNXT_ULP_CLASS_HID_2cda8 = 0x2cda8,
-	BNXT_ULP_CLASS_HID_31b5c = 0x31b5c,
-	BNXT_ULP_CLASS_HID_3845c = 0x3845c,
-	BNXT_ULP_CLASS_HID_22ff8 = 0x22ff8,
-	BNXT_ULP_CLASS_HID_2d8f8 = 0x2d8f8,
-	BNXT_ULP_CLASS_HID_345f8 = 0x345f8,
-	BNXT_ULP_CLASS_HID_393ac = 0x393ac,
-	BNXT_ULP_CLASS_HID_228ac = 0x228ac,
-	BNXT_ULP_CLASS_HID_2d5ac = 0x2d5ac,
-	BNXT_ULP_CLASS_HID_35eac = 0x35eac,
-	BNXT_ULP_CLASS_HID_3cbac = 0x3cbac,
-	BNXT_ULP_CLASS_HID_25d5c = 0x25d5c,
-	BNXT_ULP_CLASS_HID_2c65c = 0x2c65c,
-	BNXT_ULP_CLASS_HID_31410 = 0x31410,
-	BNXT_ULP_CLASS_HID_38110 = 0x38110,
-	BNXT_ULP_CLASS_HID_209f0 = 0x209f0,
-	BNXT_ULP_CLASS_HID_2b2f0 = 0x2b2f0,
-	BNXT_ULP_CLASS_HID_33ff0 = 0x33ff0,
-	BNXT_ULP_CLASS_HID_3a8f0 = 0x3a8f0,
-	BNXT_ULP_CLASS_HID_214c0 = 0x214c0,
-	BNXT_ULP_CLASS_HID_281c0 = 0x281c0,
-	BNXT_ULP_CLASS_HID_30ac0 = 0x30ac0,
-	BNXT_ULP_CLASS_HID_3b7c0 = 0x3b7c0,
-	BNXT_ULP_CLASS_HID_211f4 = 0x211f4,
-	BNXT_ULP_CLASS_HID_29af4 = 0x29af4,
-	BNXT_ULP_CLASS_HID_307f4 = 0x307f4,
-	BNXT_ULP_CLASS_HID_3b0f4 = 0x3b0f4,
-	BNXT_ULP_CLASS_HID_202a4 = 0x202a4,
-	BNXT_ULP_CLASS_HID_28fa4 = 0x28fa4,
-	BNXT_ULP_CLASS_HID_338a4 = 0x338a4,
-	BNXT_ULP_CLASS_HID_3a5a4 = 0x3a5a4,
+	BNXT_ULP_CLASS_HID_22f74 = 0x22f74,
+	BNXT_ULP_CLASS_HID_24664 = 0x24664,
+	BNXT_ULP_CLASS_HID_23314 = 0x23314,
 	BNXT_ULP_CLASS_HID_22a04 = 0x22a04,
-	BNXT_ULP_CLASS_HID_2d704 = 0x2d704,
-	BNXT_ULP_CLASS_HID_34004 = 0x34004,
-	BNXT_ULP_CLASS_HID_3cd04 = 0x3cd04,
-	BNXT_ULP_CLASS_HID_23954 = 0x23954,
-	BNXT_ULP_CLASS_HID_2a254 = 0x2a254,
-	BNXT_ULP_CLASS_HID_32f54 = 0x32f54,
-	BNXT_ULP_CLASS_HID_3d854 = 0x3d854,
-	BNXT_ULP_CLASS_HID_23208 = 0x23208,
-	BNXT_ULP_CLASS_HID_2bf08 = 0x2bf08,
-	BNXT_ULP_CLASS_HID_32808 = 0x32808,
-	BNXT_ULP_CLASS_HID_3d508 = 0x3d508,
-	BNXT_ULP_CLASS_HID_22738 = 0x22738,
-	BNXT_ULP_CLASS_HID_2d038 = 0x2d038,
-	BNXT_ULP_CLASS_HID_35d38 = 0x35d38,
-	BNXT_ULP_CLASS_HID_3c638 = 0x3c638,
+	BNXT_ULP_CLASS_HID_238d0 = 0x238d0,
+	BNXT_ULP_CLASS_HID_253c0 = 0x253c0,
+	BNXT_ULP_CLASS_HID_24dcc = 0x24dcc,
+	BNXT_ULP_CLASS_HID_209f0 = 0x209f0,
+	BNXT_ULP_CLASS_HID_214bc = 0x214bc,
+	BNXT_ULP_CLASS_HID_20fac = 0x20fac,
+	BNXT_ULP_CLASS_HID_257a8 = 0x257a8,
 	BNXT_ULP_CLASS_HID_2134c = 0x2134c,
-	BNXT_ULP_CLASS_HID_29c4c = 0x29c4c,
-	BNXT_ULP_CLASS_HID_3094c = 0x3094c,
-	BNXT_ULP_CLASS_HID_3b24c = 0x3b24c,
-	BNXT_ULP_CLASS_HID_25de8 = 0x25de8,
-	BNXT_ULP_CLASS_HID_2c6e8 = 0x2c6e8,
-	BNXT_ULP_CLASS_HID_3149c = 0x3149c,
-	BNXT_ULP_CLASS_HID_3819c = 0x3819c,
-	BNXT_ULP_CLASS_HID_2569c = 0x2569c,
-	BNXT_ULP_CLASS_HID_2c39c = 0x2c39c,
-	BNXT_ULP_CLASS_HID_31150 = 0x31150,
-	BNXT_ULP_CLASS_HID_39a50 = 0x39a50,
-	BNXT_ULP_CLASS_HID_24b4c = 0x24b4c,
-	BNXT_ULP_CLASS_HID_29900 = 0x29900,
-	BNXT_ULP_CLASS_HID_30200 = 0x30200,
-	BNXT_ULP_CLASS_HID_38f00 = 0x38f00,
-	BNXT_ULP_CLASS_HID_22f74 = 0x22f74,
-	BNXT_ULP_CLASS_HID_2d874 = 0x2d874,
-	BNXT_ULP_CLASS_HID_34574 = 0x34574,
-	BNXT_ULP_CLASS_HID_39328 = 0x39328,
+	BNXT_ULP_CLASS_HID_25d64 = 0x25d64,
+	BNXT_ULP_CLASS_HID_21908 = 0x21908,
+	BNXT_ULP_CLASS_HID_23488 = 0x23488,
+	BNXT_ULP_CLASS_HID_22ff8 = 0x22ff8,
 	BNXT_ULP_CLASS_HID_23a44 = 0x23a44,
-	BNXT_ULP_CLASS_HID_2a744 = 0x2a744,
-	BNXT_ULP_CLASS_HID_35044 = 0x35044,
-	BNXT_ULP_CLASS_HID_3dd44 = 0x3dd44,
-	BNXT_ULP_CLASS_HID_23778 = 0x23778,
-	BNXT_ULP_CLASS_HID_2a078 = 0x2a078,
-	BNXT_ULP_CLASS_HID_32d78 = 0x32d78,
-	BNXT_ULP_CLASS_HID_3d678 = 0x3d678,
-	BNXT_ULP_CLASS_HID_22828 = 0x22828,
-	BNXT_ULP_CLASS_HID_2d528 = 0x2d528,
-	BNXT_ULP_CLASS_HID_35e28 = 0x35e28,
-	BNXT_ULP_CLASS_HID_3cb28 = 0x3cb28,
-	BNXT_ULP_CLASS_HID_214bc = 0x214bc,
-	BNXT_ULP_CLASS_HID_281bc = 0x281bc,
-	BNXT_ULP_CLASS_HID_30abc = 0x30abc,
-	BNXT_ULP_CLASS_HID_3b7bc = 0x3b7bc,
+	BNXT_ULP_CLASS_HID_255b4 = 0x255b4,
+	BNXT_ULP_CLASS_HID_21e64 = 0x21e64,
+	BNXT_ULP_CLASS_HID_23954 = 0x23954,
+	BNXT_ULP_CLASS_HID_20420 = 0x20420,
+	BNXT_ULP_CLASS_HID_23f10 = 0x23f10,
+	BNXT_ULP_CLASS_HID_2591c = 0x2591c,
+	BNXT_ULP_CLASS_HID_214c0 = 0x214c0,
 	BNXT_ULP_CLASS_HID_25ed8 = 0x25ed8,
-	BNXT_ULP_CLASS_HID_2cbd8 = 0x2cbd8,
-	BNXT_ULP_CLASS_HID_3198c = 0x3198c,
-	BNXT_ULP_CLASS_HID_3828c = 0x3828c,
-	BNXT_ULP_CLASS_HID_25b8c = 0x25b8c,
-	BNXT_ULP_CLASS_HID_2c48c = 0x2c48c,
-	BNXT_ULP_CLASS_HID_31240 = 0x31240,
-	BNXT_ULP_CLASS_HID_39f40 = 0x39f40,
-	BNXT_ULP_CLASS_HID_21170 = 0x21170,
-	BNXT_ULP_CLASS_HID_29a70 = 0x29a70,
-	BNXT_ULP_CLASS_HID_30770 = 0x30770,
-	BNXT_ULP_CLASS_HID_3b070 = 0x3b070,
-	BNXT_ULP_CLASS_HID_238d0 = 0x238d0,
-	BNXT_ULP_CLASS_HID_2a5d0 = 0x2a5d0,
+	BNXT_ULP_CLASS_HID_21afc = 0x21afc,
+	BNXT_ULP_CLASS_HID_222f8 = 0x222f8,
+	BNXT_ULP_CLASS_HID_25de8 = 0x25de8,
+	BNXT_ULP_CLASS_HID_228b4 = 0x228b4,
+	BNXT_ULP_CLASS_HID_243a4 = 0x243a4,
+	BNXT_ULP_CLASS_HID_6226c = 0x6226c,
+	BNXT_ULP_CLASS_HID_65d5c = 0x65d5c,
+	BNXT_ULP_CLASS_HID_62828 = 0x62828,
+	BNXT_ULP_CLASS_HID_64318 = 0x64318,
+	BNXT_ULP_CLASS_HID_60fc8 = 0x60fc8,
+	BNXT_ULP_CLASS_HID_62738 = 0x62738,
+	BNXT_ULP_CLASS_HID_63584 = 0x63584,
+	BNXT_ULP_CLASS_HID_62cf4 = 0x62cf4,
+	BNXT_ULP_CLASS_HID_64680 = 0x64680,
+	BNXT_ULP_CLASS_HID_602a4 = 0x602a4,
+	BNXT_ULP_CLASS_HID_61170 = 0x61170,
+	BNXT_ULP_CLASS_HID_60860 = 0x60860,
+	BNXT_ULP_CLASS_HID_6505c = 0x6505c,
+	BNXT_ULP_CLASS_HID_64b4c = 0x64b4c,
+	BNXT_ULP_CLASS_HID_65618 = 0x65618,
+	BNXT_ULP_CLASS_HID_6123c = 0x6123c,
+	BNXT_ULP_CLASS_HID_631bc = 0x631bc,
+	BNXT_ULP_CLASS_HID_628ac = 0x628ac,
+	BNXT_ULP_CLASS_HID_63778 = 0x63778,
+	BNXT_ULP_CLASS_HID_62e68 = 0x62e68,
+	BNXT_ULP_CLASS_HID_61b18 = 0x61b18,
+	BNXT_ULP_CLASS_HID_63208 = 0x63208,
+	BNXT_ULP_CLASS_HID_600d4 = 0x600d4,
+	BNXT_ULP_CLASS_HID_63bc4 = 0x63bc4,
+	BNXT_ULP_CLASS_HID_655d0 = 0x655d0,
+	BNXT_ULP_CLASS_HID_611f4 = 0x611f4,
+	BNXT_ULP_CLASS_HID_65b8c = 0x65b8c,
+	BNXT_ULP_CLASS_HID_617b0 = 0x617b0,
+	BNXT_ULP_CLASS_HID_63fac = 0x63fac,
+	BNXT_ULP_CLASS_HID_6569c = 0x6569c,
+	BNXT_ULP_CLASS_HID_62568 = 0x62568,
+	BNXT_ULP_CLASS_HID_65c58 = 0x65c58,
+	BNXT_ULP_CLASS_HID_35fb8 = 0x35fb8,
+	BNXT_ULP_CLASS_HID_31b5c = 0x31b5c,
+	BNXT_ULP_CLASS_HID_34574 = 0x34574,
+	BNXT_ULP_CLASS_HID_30118 = 0x30118,
+	BNXT_ULP_CLASS_HID_32914 = 0x32914,
+	BNXT_ULP_CLASS_HID_34004 = 0x34004,
 	BNXT_ULP_CLASS_HID_32ed0 = 0x32ed0,
-	BNXT_ULP_CLASS_HID_3dbd0 = 0x3dbd0,
-	BNXT_ULP_CLASS_HID_20420 = 0x20420,
-	BNXT_ULP_CLASS_HID_2b120 = 0x2b120,
-	BNXT_ULP_CLASS_HID_33a20 = 0x33a20,
-	BNXT_ULP_CLASS_HID_3a720 = 0x3a720,
-	BNXT_ULP_CLASS_HID_200d4 = 0x200d4,
-	BNXT_ULP_CLASS_HID_28dd4 = 0x28dd4,
-	BNXT_ULP_CLASS_HID_336d4 = 0x336d4,
-	BNXT_ULP_CLASS_HID_3a3d4 = 0x3a3d4,
-	BNXT_ULP_CLASS_HID_23584 = 0x23584,
-	BNXT_ULP_CLASS_HID_2be84 = 0x2be84,
-	BNXT_ULP_CLASS_HID_32b84 = 0x32b84,
-	BNXT_ULP_CLASS_HID_3d484 = 0x3d484,
-	BNXT_ULP_CLASS_HID_25d64 = 0x25d64,
-	BNXT_ULP_CLASS_HID_2c664 = 0x2c664,
+	BNXT_ULP_CLASS_HID_349c0 = 0x349c0,
+	BNXT_ULP_CLASS_HID_30480 = 0x30480,
+	BNXT_ULP_CLASS_HID_33ff0 = 0x33ff0,
+	BNXT_ULP_CLASS_HID_30abc = 0x30abc,
+	BNXT_ULP_CLASS_HID_325ac = 0x325ac,
+	BNXT_ULP_CLASS_HID_34da8 = 0x34da8,
+	BNXT_ULP_CLASS_HID_3094c = 0x3094c,
 	BNXT_ULP_CLASS_HID_31418 = 0x31418,
-	BNXT_ULP_CLASS_HID_38118 = 0x38118,
-	BNXT_ULP_CLASS_HID_228b4 = 0x228b4,
-	BNXT_ULP_CLASS_HID_2d5b4 = 0x2d5b4,
+	BNXT_ULP_CLASS_HID_30f08 = 0x30f08,
+	BNXT_ULP_CLASS_HID_32a88 = 0x32a88,
+	BNXT_ULP_CLASS_HID_345f8 = 0x345f8,
+	BNXT_ULP_CLASS_HID_35044 = 0x35044,
+	BNXT_ULP_CLASS_HID_34bb4 = 0x34bb4,
+	BNXT_ULP_CLASS_HID_33464 = 0x33464,
+	BNXT_ULP_CLASS_HID_32f54 = 0x32f54,
+	BNXT_ULP_CLASS_HID_33a20 = 0x33a20,
+	BNXT_ULP_CLASS_HID_35510 = 0x35510,
+	BNXT_ULP_CLASS_HID_313d0 = 0x313d0,
+	BNXT_ULP_CLASS_HID_30ac0 = 0x30ac0,
+	BNXT_ULP_CLASS_HID_3198c = 0x3198c,
+	BNXT_ULP_CLASS_HID_330fc = 0x330fc,
+	BNXT_ULP_CLASS_HID_358f8 = 0x358f8,
+	BNXT_ULP_CLASS_HID_3149c = 0x3149c,
 	BNXT_ULP_CLASS_HID_35eb4 = 0x35eb4,
-	BNXT_ULP_CLASS_HID_3cbb4 = 0x3cbb4,
-	BNXT_ULP_CLASS_HID_22568 = 0x22568,
-	BNXT_ULP_CLASS_HID_2ae68 = 0x2ae68,
-	BNXT_ULP_CLASS_HID_35b68 = 0x35b68,
-	BNXT_ULP_CLASS_HID_3c468 = 0x3c468,
-	BNXT_ULP_CLASS_HID_25618 = 0x25618,
-	BNXT_ULP_CLASS_HID_2c318 = 0x2c318,
-	BNXT_ULP_CLASS_HID_310cc = 0x310cc,
-	BNXT_ULP_CLASS_HID_39dcc = 0x39dcc,
-	BNXT_ULP_CLASS_HID_229b8 = 0x229b8,
+	BNXT_ULP_CLASS_HID_31a58 = 0x31a58,
+	BNXT_ULP_CLASS_HID_7586c = 0x7586c,
+	BNXT_ULP_CLASS_HID_71410 = 0x71410,
+	BNXT_ULP_CLASS_HID_75e28 = 0x75e28,
+	BNXT_ULP_CLASS_HID_71dcc = 0x71dcc,
+	BNXT_ULP_CLASS_HID_725c8 = 0x725c8,
+	BNXT_ULP_CLASS_HID_75d38 = 0x75d38,
+	BNXT_ULP_CLASS_HID_72b84 = 0x72b84,
+	BNXT_ULP_CLASS_HID_742f4 = 0x742f4,
+	BNXT_ULP_CLASS_HID_701b4 = 0x701b4,
+	BNXT_ULP_CLASS_HID_738a4 = 0x738a4,
+	BNXT_ULP_CLASS_HID_70770 = 0x70770,
+	BNXT_ULP_CLASS_HID_73e60 = 0x73e60,
+	BNXT_ULP_CLASS_HID_7465c = 0x7465c,
+	BNXT_ULP_CLASS_HID_70200 = 0x70200,
+	BNXT_ULP_CLASS_HID_710cc = 0x710cc,
+	BNXT_ULP_CLASS_HID_7083c = 0x7083c,
+	BNXT_ULP_CLASS_HID_727bc = 0x727bc,
+	BNXT_ULP_CLASS_HID_75eac = 0x75eac,
+	BNXT_ULP_CLASS_HID_72d78 = 0x72d78,
+	BNXT_ULP_CLASS_HID_74468 = 0x74468,
+	BNXT_ULP_CLASS_HID_73118 = 0x73118,
+	BNXT_ULP_CLASS_HID_72808 = 0x72808,
+	BNXT_ULP_CLASS_HID_736d4 = 0x736d4,
+	BNXT_ULP_CLASS_HID_751c4 = 0x751c4,
+	BNXT_ULP_CLASS_HID_74bd0 = 0x74bd0,
+	BNXT_ULP_CLASS_HID_707f4 = 0x707f4,
+	BNXT_ULP_CLASS_HID_71240 = 0x71240,
+	BNXT_ULP_CLASS_HID_70db0 = 0x70db0,
+	BNXT_ULP_CLASS_HID_755ac = 0x755ac,
+	BNXT_ULP_CLASS_HID_71150 = 0x71150,
+	BNXT_ULP_CLASS_HID_75b68 = 0x75b68,
+	BNXT_ULP_CLASS_HID_7170c = 0x7170c,
 	BNXT_ULP_CLASS_HID_2d2b8 = 0x2d2b8,
-	BNXT_ULP_CLASS_HID_35fb8 = 0x35fb8,
-	BNXT_ULP_CLASS_HID_3c8b8 = 0x3c8b8,
-	BNXT_ULP_CLASS_HID_23488 = 0x23488,
-	BNXT_ULP_CLASS_HID_2a188 = 0x2a188,
-	BNXT_ULP_CLASS_HID_32a88 = 0x32a88,
-	BNXT_ULP_CLASS_HID_3d788 = 0x3d788,
-	BNXT_ULP_CLASS_HID_231bc = 0x231bc,
-	BNXT_ULP_CLASS_HID_2babc = 0x2babc,
-	BNXT_ULP_CLASS_HID_327bc = 0x327bc,
-	BNXT_ULP_CLASS_HID_3d0bc = 0x3d0bc,
-	BNXT_ULP_CLASS_HID_2226c = 0x2226c,
-	BNXT_ULP_CLASS_HID_2af6c = 0x2af6c,
-	BNXT_ULP_CLASS_HID_3586c = 0x3586c,
-	BNXT_ULP_CLASS_HID_3c56c = 0x3c56c,
-	BNXT_ULP_CLASS_HID_24dcc = 0x24dcc,
+	BNXT_ULP_CLASS_HID_2cda8 = 0x2cda8,
+	BNXT_ULP_CLASS_HID_2d874 = 0x2d874,
+	BNXT_ULP_CLASS_HID_29418 = 0x29418,
+	BNXT_ULP_CLASS_HID_2bc14 = 0x2bc14,
+	BNXT_ULP_CLASS_HID_2d704 = 0x2d704,
+	BNXT_ULP_CLASS_HID_2a5d0 = 0x2a5d0,
+	BNXT_ULP_CLASS_HID_2dcc0 = 0x2dcc0,
 	BNXT_ULP_CLASS_HID_29b80 = 0x29b80,
-	BNXT_ULP_CLASS_HID_30480 = 0x30480,
-	BNXT_ULP_CLASS_HID_3b180 = 0x3b180,
-	BNXT_ULP_CLASS_HID_2591c = 0x2591c,
+	BNXT_ULP_CLASS_HID_2b2f0 = 0x2b2f0,
+	BNXT_ULP_CLASS_HID_281bc = 0x281bc,
+	BNXT_ULP_CLASS_HID_2b8ac = 0x2b8ac,
+	BNXT_ULP_CLASS_HID_2c0a8 = 0x2c0a8,
+	BNXT_ULP_CLASS_HID_29c4c = 0x29c4c,
+	BNXT_ULP_CLASS_HID_2c664 = 0x2c664,
+	BNXT_ULP_CLASS_HID_28208 = 0x28208,
+	BNXT_ULP_CLASS_HID_2a188 = 0x2a188,
+	BNXT_ULP_CLASS_HID_2d8f8 = 0x2d8f8,
+	BNXT_ULP_CLASS_HID_2a744 = 0x2a744,
+	BNXT_ULP_CLASS_HID_2deb4 = 0x2deb4,
+	BNXT_ULP_CLASS_HID_28b64 = 0x28b64,
+	BNXT_ULP_CLASS_HID_2a254 = 0x2a254,
+	BNXT_ULP_CLASS_HID_2b120 = 0x2b120,
+	BNXT_ULP_CLASS_HID_2a810 = 0x2a810,
 	BNXT_ULP_CLASS_HID_2c21c = 0x2c21c,
-	BNXT_ULP_CLASS_HID_313d0 = 0x313d0,
-	BNXT_ULP_CLASS_HID_39cd0 = 0x39cd0,
-	BNXT_ULP_CLASS_HID_255d0 = 0x255d0,
-	BNXT_ULP_CLASS_HID_2ded0 = 0x2ded0,
-	BNXT_ULP_CLASS_HID_34bd0 = 0x34bd0,
-	BNXT_ULP_CLASS_HID_39984 = 0x39984,
-	BNXT_ULP_CLASS_HID_24680 = 0x24680,
-	BNXT_ULP_CLASS_HID_294b4 = 0x294b4,
-	BNXT_ULP_CLASS_HID_301b4 = 0x301b4,
-	BNXT_ULP_CLASS_HID_38ab4 = 0x38ab4,
-	BNXT_ULP_CLASS_HID_23314 = 0x23314,
-	BNXT_ULP_CLASS_HID_2bc14 = 0x2bc14,
-	BNXT_ULP_CLASS_HID_32914 = 0x32914,
+	BNXT_ULP_CLASS_HID_281c0 = 0x281c0,
+	BNXT_ULP_CLASS_HID_2cbd8 = 0x2cbd8,
+	BNXT_ULP_CLASS_HID_287fc = 0x287fc,
+	BNXT_ULP_CLASS_HID_2aff8 = 0x2aff8,
+	BNXT_ULP_CLASS_HID_2c6e8 = 0x2c6e8,
+	BNXT_ULP_CLASS_HID_2d5b4 = 0x2d5b4,
+	BNXT_ULP_CLASS_HID_29158 = 0x29158,
+	BNXT_ULP_CLASS_HID_6af6c = 0x6af6c,
+	BNXT_ULP_CLASS_HID_6c65c = 0x6c65c,
+	BNXT_ULP_CLASS_HID_6d528 = 0x6d528,
+	BNXT_ULP_CLASS_HID_690cc = 0x690cc,
+	BNXT_ULP_CLASS_HID_6b8c8 = 0x6b8c8,
+	BNXT_ULP_CLASS_HID_6d038 = 0x6d038,
+	BNXT_ULP_CLASS_HID_6be84 = 0x6be84,
+	BNXT_ULP_CLASS_HID_6d9f4 = 0x6d9f4,
+	BNXT_ULP_CLASS_HID_694b4 = 0x694b4,
+	BNXT_ULP_CLASS_HID_68fa4 = 0x68fa4,
+	BNXT_ULP_CLASS_HID_69a70 = 0x69a70,
+	BNXT_ULP_CLASS_HID_6b560 = 0x6b560,
+	BNXT_ULP_CLASS_HID_6dd5c = 0x6dd5c,
+	BNXT_ULP_CLASS_HID_69900 = 0x69900,
+	BNXT_ULP_CLASS_HID_6c318 = 0x6c318,
+	BNXT_ULP_CLASS_HID_69f3c = 0x69f3c,
+	BNXT_ULP_CLASS_HID_6babc = 0x6babc,
+	BNXT_ULP_CLASS_HID_6d5ac = 0x6d5ac,
+	BNXT_ULP_CLASS_HID_6a078 = 0x6a078,
+	BNXT_ULP_CLASS_HID_6db68 = 0x6db68,
+	BNXT_ULP_CLASS_HID_68418 = 0x68418,
+	BNXT_ULP_CLASS_HID_6bf08 = 0x6bf08,
+	BNXT_ULP_CLASS_HID_68dd4 = 0x68dd4,
+	BNXT_ULP_CLASS_HID_6a4c4 = 0x6a4c4,
+	BNXT_ULP_CLASS_HID_6ded0 = 0x6ded0,
+	BNXT_ULP_CLASS_HID_69af4 = 0x69af4,
+	BNXT_ULP_CLASS_HID_6c48c = 0x6c48c,
+	BNXT_ULP_CLASS_HID_680b0 = 0x680b0,
+	BNXT_ULP_CLASS_HID_6a8ac = 0x6a8ac,
+	BNXT_ULP_CLASS_HID_6c39c = 0x6c39c,
+	BNXT_ULP_CLASS_HID_6ae68 = 0x6ae68,
+	BNXT_ULP_CLASS_HID_6c958 = 0x6c958,
+	BNXT_ULP_CLASS_HID_3c8b8 = 0x3c8b8,
+	BNXT_ULP_CLASS_HID_3845c = 0x3845c,
+	BNXT_ULP_CLASS_HID_39328 = 0x39328,
+	BNXT_ULP_CLASS_HID_38a18 = 0x38a18,
 	BNXT_ULP_CLASS_HID_3d214 = 0x3d214,
-	BNXT_ULP_CLASS_HID_21e64 = 0x21e64,
-	BNXT_ULP_CLASS_HID_28b64 = 0x28b64,
-	BNXT_ULP_CLASS_HID_33464 = 0x33464,
-	BNXT_ULP_CLASS_HID_3a164 = 0x3a164,
-	BNXT_ULP_CLASS_HID_21b18 = 0x21b18,
-	BNXT_ULP_CLASS_HID_28418 = 0x28418,
-	BNXT_ULP_CLASS_HID_33118 = 0x33118,
-	BNXT_ULP_CLASS_HID_3ba18 = 0x3ba18,
-	BNXT_ULP_CLASS_HID_20fc8 = 0x20fc8,
-	BNXT_ULP_CLASS_HID_2b8c8 = 0x2b8c8,
-	BNXT_ULP_CLASS_HID_325c8 = 0x325c8,
-	BNXT_ULP_CLASS_HID_3aec8 = 0x3aec8,
-	BNXT_ULP_CLASS_HID_257a8 = 0x257a8,
-	BNXT_ULP_CLASS_HID_2c0a8 = 0x2c0a8,
-	BNXT_ULP_CLASS_HID_34da8 = 0x34da8,
+	BNXT_ULP_CLASS_HID_3cd04 = 0x3cd04,
+	BNXT_ULP_CLASS_HID_3dbd0 = 0x3dbd0,
+	BNXT_ULP_CLASS_HID_397f4 = 0x397f4,
+	BNXT_ULP_CLASS_HID_3b180 = 0x3b180,
+	BNXT_ULP_CLASS_HID_3a8f0 = 0x3a8f0,
+	BNXT_ULP_CLASS_HID_3b7bc = 0x3b7bc,
+	BNXT_ULP_CLASS_HID_3aeac = 0x3aeac,
 	BNXT_ULP_CLASS_HID_39b5c = 0x39b5c,
-	BNXT_ULP_CLASS_HID_222f8 = 0x222f8,
-	BNXT_ULP_CLASS_HID_2aff8 = 0x2aff8,
-	BNXT_ULP_CLASS_HID_358f8 = 0x358f8,
+	BNXT_ULP_CLASS_HID_3b24c = 0x3b24c,
+	BNXT_ULP_CLASS_HID_38118 = 0x38118,
+	BNXT_ULP_CLASS_HID_3b808 = 0x3b808,
+	BNXT_ULP_CLASS_HID_3d788 = 0x3d788,
+	BNXT_ULP_CLASS_HID_393ac = 0x393ac,
+	BNXT_ULP_CLASS_HID_3dd44 = 0x3dd44,
+	BNXT_ULP_CLASS_HID_39968 = 0x39968,
+	BNXT_ULP_CLASS_HID_3a164 = 0x3a164,
+	BNXT_ULP_CLASS_HID_3d854 = 0x3d854,
+	BNXT_ULP_CLASS_HID_3a720 = 0x3a720,
+	BNXT_ULP_CLASS_HID_3de10 = 0x3de10,
+	BNXT_ULP_CLASS_HID_39cd0 = 0x39cd0,
+	BNXT_ULP_CLASS_HID_3b7c0 = 0x3b7c0,
+	BNXT_ULP_CLASS_HID_3828c = 0x3828c,
+	BNXT_ULP_CLASS_HID_3bdfc = 0x3bdfc,
 	BNXT_ULP_CLASS_HID_3c5f8 = 0x3c5f8,
-	BNXT_ULP_CLASS_HID_23fac = 0x23fac,
-	BNXT_ULP_CLASS_HID_2a8ac = 0x2a8ac,
-	BNXT_ULP_CLASS_HID_355ac = 0x355ac,
-	BNXT_ULP_CLASS_HID_3deac = 0x3deac,
-	BNXT_ULP_CLASS_HID_2505c = 0x2505c,
-	BNXT_ULP_CLASS_HID_2dd5c = 0x2dd5c,
-	BNXT_ULP_CLASS_HID_3465c = 0x3465c,
-	BNXT_ULP_CLASS_HID_39410 = 0x39410,
-	BNXT_ULP_CLASS_HID_223fc = 0x223fc,
-	BNXT_ULP_CLASS_HID_2acfc = 0x2acfc,
-	BNXT_ULP_CLASS_HID_359fc = 0x359fc,
-	BNXT_ULP_CLASS_HID_3c2fc = 0x3c2fc,
-	BNXT_ULP_CLASS_HID_20ecc = 0x20ecc,
-	BNXT_ULP_CLASS_HID_2bbcc = 0x2bbcc,
-	BNXT_ULP_CLASS_HID_324cc = 0x324cc,
-	BNXT_ULP_CLASS_HID_3d1cc = 0x3d1cc,
-	BNXT_ULP_CLASS_HID_20b80 = 0x20b80,
-	BNXT_ULP_CLASS_HID_2b480 = 0x2b480,
-	BNXT_ULP_CLASS_HID_32180 = 0x32180,
-	BNXT_ULP_CLASS_HID_3aa80 = 0x3aa80,
-	BNXT_ULP_CLASS_HID_23cb0 = 0x23cb0,
-	BNXT_ULP_CLASS_HID_2a9b0 = 0x2a9b0,
-	BNXT_ULP_CLASS_HID_352b0 = 0x352b0,
-	BNXT_ULP_CLASS_HID_3dfb0 = 0x3dfb0,
-	BNXT_ULP_CLASS_HID_24410 = 0x24410,
-	BNXT_ULP_CLASS_HID_295c4 = 0x295c4,
-	BNXT_ULP_CLASS_HID_31ec4 = 0x31ec4,
-	BNXT_ULP_CLASS_HID_38bc4 = 0x38bc4,
-	BNXT_ULP_CLASS_HID_25360 = 0x25360,
-	BNXT_ULP_CLASS_HID_2dc60 = 0x2dc60,
-	BNXT_ULP_CLASS_HID_34960 = 0x34960,
-	BNXT_ULP_CLASS_HID_39714 = 0x39714,
-	BNXT_ULP_CLASS_HID_22c14 = 0x22c14,
-	BNXT_ULP_CLASS_HID_2d914 = 0x2d914,
-	BNXT_ULP_CLASS_HID_34214 = 0x34214,
-	BNXT_ULP_CLASS_HID_393c8 = 0x393c8,
-	BNXT_ULP_CLASS_HID_240c4 = 0x240c4,
-	BNXT_ULP_CLASS_HID_2cdc4 = 0x2cdc4,
-	BNXT_ULP_CLASS_HID_31bf8 = 0x31bf8,
-	BNXT_ULP_CLASS_HID_384f8 = 0x384f8,
-	BNXT_ULP_CLASS_HID_23dc0 = 0x23dc0,
-	BNXT_ULP_CLASS_HID_2a6c0 = 0x2a6c0,
-	BNXT_ULP_CLASS_HID_353c0 = 0x353c0,
-	BNXT_ULP_CLASS_HID_3dcc0 = 0x3dcc0,
-	BNXT_ULP_CLASS_HID_20910 = 0x20910,
-	BNXT_ULP_CLASS_HID_2b210 = 0x2b210,
-	BNXT_ULP_CLASS_HID_33f10 = 0x33f10,
-	BNXT_ULP_CLASS_HID_3a810 = 0x3a810,
-	BNXT_ULP_CLASS_HID_205c4 = 0x205c4,
-	BNXT_ULP_CLASS_HID_28ec4 = 0x28ec4,
-	BNXT_ULP_CLASS_HID_33bc4 = 0x33bc4,
-	BNXT_ULP_CLASS_HID_3a4c4 = 0x3a4c4,
-	BNXT_ULP_CLASS_HID_236f4 = 0x236f4,
-	BNXT_ULP_CLASS_HID_2a3f4 = 0x2a3f4,
-	BNXT_ULP_CLASS_HID_32cf4 = 0x32cf4,
-	BNXT_ULP_CLASS_HID_3d9f4 = 0x3d9f4,
-	BNXT_ULP_CLASS_HID_25e54 = 0x25e54,
-	BNXT_ULP_CLASS_HID_2cb54 = 0x2cb54,
-	BNXT_ULP_CLASS_HID_31908 = 0x31908,
-	BNXT_ULP_CLASS_HID_38208 = 0x38208,
-	BNXT_ULP_CLASS_HID_22da4 = 0x22da4,
-	BNXT_ULP_CLASS_HID_2d6a4 = 0x2d6a4,
-	BNXT_ULP_CLASS_HID_343a4 = 0x343a4,
-	BNXT_ULP_CLASS_HID_39158 = 0x39158,
-	BNXT_ULP_CLASS_HID_22658 = 0x22658,
-	BNXT_ULP_CLASS_HID_2d358 = 0x2d358,
-	BNXT_ULP_CLASS_HID_35c58 = 0x35c58,
-	BNXT_ULP_CLASS_HID_3c958 = 0x3c958,
-	BNXT_ULP_CLASS_HID_25b08 = 0x25b08,
-	BNXT_ULP_CLASS_HID_2c408 = 0x2c408,
-	BNXT_ULP_CLASS_HID_3123c = 0x3123c,
-	BNXT_ULP_CLASS_HID_39f3c = 0x39f3c,
-	BNXT_ULP_CLASS_HID_34a8 = 0x34a8,
-	BNXT_ULP_CLASS_HID_3a64 = 0x3a64,
-	BNXT_ULP_CLASS_HID_09b4 = 0x09b4,
-	BNXT_ULP_CLASS_HID_5ef8 = 0x5ef8,
-	BNXT_ULP_CLASS_HID_2dc8 = 0x2dc8,
-	BNXT_ULP_CLASS_HID_07c0 = 0x07c0,
-	BNXT_ULP_CLASS_HID_1310 = 0x1310,
-	BNXT_ULP_CLASS_HID_2854 = 0x2854,
-	BNXT_ULP_CLASS_HID_37a4 = 0x37a4,
-	BNXT_ULP_CLASS_HID_03f8 = 0x03f8,
-	BNXT_ULP_CLASS_HID_593c = 0x593c,
-	BNXT_ULP_CLASS_HID_240c = 0x240c,
-	BNXT_ULP_CLASS_HID_1e04 = 0x1e04,
-	BNXT_ULP_CLASS_HID_48a0 = 0x48a0,
-	BNXT_ULP_CLASS_HID_2298 = 0x2298,
-	BNXT_ULP_CLASS_HID_31e8 = 0x31e8,
+	BNXT_ULP_CLASS_HID_3819c = 0x3819c,
+	BNXT_ULP_CLASS_HID_3cbb4 = 0x3cbb4,
+	BNXT_ULP_CLASS_HID_38758 = 0x38758,
+	BNXT_ULP_CLASS_HID_7c56c = 0x7c56c,
+	BNXT_ULP_CLASS_HID_78110 = 0x78110,
+	BNXT_ULP_CLASS_HID_7cb28 = 0x7cb28,
+	BNXT_ULP_CLASS_HID_786cc = 0x786cc,
+	BNXT_ULP_CLASS_HID_7aec8 = 0x7aec8,
+	BNXT_ULP_CLASS_HID_7c638 = 0x7c638,
+	BNXT_ULP_CLASS_HID_7d484 = 0x7d484,
+	BNXT_ULP_CLASS_HID_790a8 = 0x790a8,
+	BNXT_ULP_CLASS_HID_78ab4 = 0x78ab4,
+	BNXT_ULP_CLASS_HID_7a5a4 = 0x7a5a4,
+	BNXT_ULP_CLASS_HID_7b070 = 0x7b070,
+	BNXT_ULP_CLASS_HID_7ab60 = 0x7ab60,
+	BNXT_ULP_CLASS_HID_79410 = 0x79410,
+	BNXT_ULP_CLASS_HID_78f00 = 0x78f00,
+	BNXT_ULP_CLASS_HID_79dcc = 0x79dcc,
+	BNXT_ULP_CLASS_HID_7b53c = 0x7b53c,
+	BNXT_ULP_CLASS_HID_7d0bc = 0x7d0bc,
+	BNXT_ULP_CLASS_HID_7cbac = 0x7cbac,
+	BNXT_ULP_CLASS_HID_7d678 = 0x7d678,
+	BNXT_ULP_CLASS_HID_7921c = 0x7921c,
+	BNXT_ULP_CLASS_HID_7ba18 = 0x7ba18,
+	BNXT_ULP_CLASS_HID_7d508 = 0x7d508,
+	BNXT_ULP_CLASS_HID_7a3d4 = 0x7a3d4,
+	BNXT_ULP_CLASS_HID_7dac4 = 0x7dac4,
+	BNXT_ULP_CLASS_HID_79984 = 0x79984,
+	BNXT_ULP_CLASS_HID_7b0f4 = 0x7b0f4,
+	BNXT_ULP_CLASS_HID_79f40 = 0x79f40,
+	BNXT_ULP_CLASS_HID_7b6b0 = 0x7b6b0,
+	BNXT_ULP_CLASS_HID_7deac = 0x7deac,
+	BNXT_ULP_CLASS_HID_79a50 = 0x79a50,
+	BNXT_ULP_CLASS_HID_7c468 = 0x7c468,
+	BNXT_ULP_CLASS_HID_7800c = 0x7800c,
+	BNXT_ULP_CLASS_HID_86c0 = 0x86c0,
+	BNXT_ULP_CLASS_HID_a1d0 = 0xa1d0,
+	BNXT_ULP_CLASS_HID_8c0c = 0x8c0c,
+	BNXT_ULP_CLASS_HID_a71c = 0xa71c,
+	BNXT_ULP_CLASS_HID_906c = 0x906c,
+	BNXT_ULP_CLASS_HID_8b7c = 0x8b7c,
+	BNXT_ULP_CLASS_HID_99a8 = 0x99a8,
+	BNXT_ULP_CLASS_HID_b0b8 = 0xb0b8,
+	BNXT_ULP_CLASS_HID_aab4 = 0xaab4,
+	BNXT_ULP_CLASS_HID_c244 = 0xc244,
+	BNXT_ULP_CLASS_HID_d0f0 = 0xd0f0,
+	BNXT_ULP_CLASS_HID_cb80 = 0xcb80,
+	BNXT_ULP_CLASS_HID_b4d0 = 0xb4d0,
+	BNXT_ULP_CLASS_HID_afe0 = 0xafe0,
+	BNXT_ULP_CLASS_HID_ba1c = 0xba1c,
+	BNXT_ULP_CLASS_HID_d52c = 0xd52c,
+	BNXT_ULP_CLASS_HID_48314 = 0x48314,
+	BNXT_ULP_CLASS_HID_4ba24 = 0x4ba24,
+	BNXT_ULP_CLASS_HID_48950 = 0x48950,
+	BNXT_ULP_CLASS_HID_4a060 = 0x4a060,
+	BNXT_ULP_CLASS_HID_4c86c = 0x4c86c,
+	BNXT_ULP_CLASS_HID_48440 = 0x48440,
+	BNXT_ULP_CLASS_HID_492fc = 0x492fc,
+	BNXT_ULP_CLASS_HID_48d8c = 0x48d8c,
+	BNXT_ULP_CLASS_HID_4a7f8 = 0x4a7f8,
+	BNXT_ULP_CLASS_HID_4de88 = 0x4de88,
+	BNXT_ULP_CLASS_HID_4adc4 = 0x4adc4,
+	BNXT_ULP_CLASS_HID_4c4d4 = 0x4c4d4,
+	BNXT_ULP_CLASS_HID_4b124 = 0x4b124,
+	BNXT_ULP_CLASS_HID_4a834 = 0x4a834,
+	BNXT_ULP_CLASS_HID_4b760 = 0x4b760,
+	BNXT_ULP_CLASS_HID_4ae70 = 0x4ae70,
+	BNXT_ULP_CLASS_HID_1bcc0 = 0x1bcc0,
+	BNXT_ULP_CLASS_HID_1d7d0 = 0x1d7d0,
+	BNXT_ULP_CLASS_HID_1a20c = 0x1a20c,
+	BNXT_ULP_CLASS_HID_1dd1c = 0x1dd1c,
+	BNXT_ULP_CLASS_HID_1866c = 0x1866c,
+	BNXT_ULP_CLASS_HID_1a17c = 0x1a17c,
+	BNXT_ULP_CLASS_HID_18fa8 = 0x18fa8,
+	BNXT_ULP_CLASS_HID_1a6b8 = 0x1a6b8,
+	BNXT_ULP_CLASS_HID_1c0b4 = 0x1c0b4,
+	BNXT_ULP_CLASS_HID_19c88 = 0x19c88,
+	BNXT_ULP_CLASS_HID_1c6f0 = 0x1c6f0,
+	BNXT_ULP_CLASS_HID_182d4 = 0x182d4,
+	BNXT_ULP_CLASS_HID_1aad0 = 0x1aad0,
+	BNXT_ULP_CLASS_HID_1c5e0 = 0x1c5e0,
+	BNXT_ULP_CLASS_HID_1d01c = 0x1d01c,
+	BNXT_ULP_CLASS_HID_1cb2c = 0x1cb2c,
+	BNXT_ULP_CLASS_HID_5b914 = 0x5b914,
+	BNXT_ULP_CLASS_HID_5d024 = 0x5d024,
+	BNXT_ULP_CLASS_HID_5bf50 = 0x5bf50,
+	BNXT_ULP_CLASS_HID_5d660 = 0x5d660,
+	BNXT_ULP_CLASS_HID_582b0 = 0x582b0,
+	BNXT_ULP_CLASS_HID_5ba40 = 0x5ba40,
+	BNXT_ULP_CLASS_HID_588fc = 0x588fc,
+	BNXT_ULP_CLASS_HID_5a38c = 0x5a38c,
+	BNXT_ULP_CLASS_HID_5ddf8 = 0x5ddf8,
+	BNXT_ULP_CLASS_HID_599dc = 0x599dc,
+	BNXT_ULP_CLASS_HID_5c3c4 = 0x5c3c4,
+	BNXT_ULP_CLASS_HID_59f18 = 0x59f18,
+	BNXT_ULP_CLASS_HID_5a724 = 0x5a724,
+	BNXT_ULP_CLASS_HID_5de34 = 0x5de34,
+	BNXT_ULP_CLASS_HID_5ad60 = 0x5ad60,
+	BNXT_ULP_CLASS_HID_5c470 = 0x5c470,
+	BNXT_ULP_CLASS_HID_cd40 = 0xcd40,
+	BNXT_ULP_CLASS_HID_e450 = 0xe450,
+	BNXT_ULP_CLASS_HID_f28c = 0xf28c,
+	BNXT_ULP_CLASS_HID_ed9c = 0xed9c,
+	BNXT_ULP_CLASS_HID_d6ec = 0xd6ec,
+	BNXT_ULP_CLASS_HID_f1fc = 0xf1fc,
+	BNXT_ULP_CLASS_HID_dc28 = 0xdc28,
+	BNXT_ULP_CLASS_HID_f738 = 0xf738,
+	BNXT_ULP_CLASS_HID_d134 = 0xd134,
+	BNXT_ULP_CLASS_HID_c8c4 = 0xc8c4,
+	BNXT_ULP_CLASS_HID_d770 = 0xd770,
+	BNXT_ULP_CLASS_HID_d354 = 0xd354,
+	BNXT_ULP_CLASS_HID_fb50 = 0xfb50,
+	BNXT_ULP_CLASS_HID_d260 = 0xd260,
+	BNXT_ULP_CLASS_HID_e09c = 0xe09c,
+	BNXT_ULP_CLASS_HID_dbac = 0xdbac,
+	BNXT_ULP_CLASS_HID_4c994 = 0x4c994,
+	BNXT_ULP_CLASS_HID_4e0a4 = 0x4e0a4,
+	BNXT_ULP_CLASS_HID_4cfd0 = 0x4cfd0,
+	BNXT_ULP_CLASS_HID_4e6e0 = 0x4e6e0,
+	BNXT_ULP_CLASS_HID_4d330 = 0x4d330,
+	BNXT_ULP_CLASS_HID_4cac0 = 0x4cac0,
+	BNXT_ULP_CLASS_HID_4d97c = 0x4d97c,
+	BNXT_ULP_CLASS_HID_4f00c = 0x4f00c,
+	BNXT_ULP_CLASS_HID_4ea78 = 0x4ea78,
+	BNXT_ULP_CLASS_HID_4c508 = 0x4c508,
+	BNXT_ULP_CLASS_HID_4d044 = 0x4d044,
+	BNXT_ULP_CLASS_HID_4cb54 = 0x4cb54,
+	BNXT_ULP_CLASS_HID_4f7a4 = 0x4f7a4,
+	BNXT_ULP_CLASS_HID_4eeb4 = 0x4eeb4,
+	BNXT_ULP_CLASS_HID_4fde0 = 0x4fde0,
+	BNXT_ULP_CLASS_HID_4d4f0 = 0x4d4f0,
+	BNXT_ULP_CLASS_HID_1e340 = 0x1e340,
+	BNXT_ULP_CLASS_HID_1da50 = 0x1da50,
+	BNXT_ULP_CLASS_HID_1e88c = 0x1e88c,
+	BNXT_ULP_CLASS_HID_1c39c = 0x1c39c,
+	BNXT_ULP_CLASS_HID_1ccec = 0x1ccec,
+	BNXT_ULP_CLASS_HID_1e7fc = 0x1e7fc,
+	BNXT_ULP_CLASS_HID_1f228 = 0x1f228,
+	BNXT_ULP_CLASS_HID_1ed38 = 0x1ed38,
+	BNXT_ULP_CLASS_HID_1c734 = 0x1c734,
+	BNXT_ULP_CLASS_HID_1c308 = 0x1c308,
+	BNXT_ULP_CLASS_HID_1cd70 = 0x1cd70,
+	BNXT_ULP_CLASS_HID_1c954 = 0x1c954,
+	BNXT_ULP_CLASS_HID_1d150 = 0x1d150,
+	BNXT_ULP_CLASS_HID_1c860 = 0x1c860,
+	BNXT_ULP_CLASS_HID_1d69c = 0x1d69c,
+	BNXT_ULP_CLASS_HID_1d2f0 = 0x1d2f0,
+	BNXT_ULP_CLASS_HID_5ff94 = 0x5ff94,
+	BNXT_ULP_CLASS_HID_5d6a4 = 0x5d6a4,
+	BNXT_ULP_CLASS_HID_5e5d0 = 0x5e5d0,
+	BNXT_ULP_CLASS_HID_5dce0 = 0x5dce0,
+	BNXT_ULP_CLASS_HID_5c930 = 0x5c930,
+	BNXT_ULP_CLASS_HID_5e0c0 = 0x5e0c0,
+	BNXT_ULP_CLASS_HID_5cf7c = 0x5cf7c,
+	BNXT_ULP_CLASS_HID_5e60c = 0x5e60c,
+	BNXT_ULP_CLASS_HID_5c078 = 0x5c078,
+	BNXT_ULP_CLASS_HID_5dc5c = 0x5dc5c,
+	BNXT_ULP_CLASS_HID_5c644 = 0x5c644,
+	BNXT_ULP_CLASS_HID_5c598 = 0x5c598,
+	BNXT_ULP_CLASS_HID_5eda4 = 0x5eda4,
+	BNXT_ULP_CLASS_HID_5c4b4 = 0x5c4b4,
+	BNXT_ULP_CLASS_HID_5d3e0 = 0x5d3e0,
+	BNXT_ULP_CLASS_HID_5caf0 = 0x5caf0,
+	BNXT_ULP_CLASS_HID_ab80 = 0xab80,
+	BNXT_ULP_CLASS_HID_a290 = 0xa290,
+	BNXT_ULP_CLASS_HID_b1cc = 0xb1cc,
+	BNXT_ULP_CLASS_HID_a8dc = 0xa8dc,
+	BNXT_ULP_CLASS_HID_b52c = 0xb52c,
+	BNXT_ULP_CLASS_HID_ac3c = 0xac3c,
+	BNXT_ULP_CLASS_HID_bb68 = 0xbb68,
+	BNXT_ULP_CLASS_HID_b278 = 0xb278,
+	BNXT_ULP_CLASS_HID_ac74 = 0xac74,
+	BNXT_ULP_CLASS_HID_e704 = 0xe704,
+	BNXT_ULP_CLASS_HID_f5b0 = 0xf5b0,
+	BNXT_ULP_CLASS_HID_b194 = 0xb194,
+	BNXT_ULP_CLASS_HID_b990 = 0xb990,
+	BNXT_ULP_CLASS_HID_f0a0 = 0xf0a0,
+	BNXT_ULP_CLASS_HID_bfdc = 0xbfdc,
+	BNXT_ULP_CLASS_HID_f6ec = 0xf6ec,
+	BNXT_ULP_CLASS_HID_4a4d4 = 0x4a4d4,
+	BNXT_ULP_CLASS_HID_4bfe4 = 0x4bfe4,
+	BNXT_ULP_CLASS_HID_4aa10 = 0x4aa10,
+	BNXT_ULP_CLASS_HID_4a520 = 0x4a520,
+	BNXT_ULP_CLASS_HID_4ed2c = 0x4ed2c,
+	BNXT_ULP_CLASS_HID_4a900 = 0x4a900,
+	BNXT_ULP_CLASS_HID_4b7bc = 0x4b7bc,
+	BNXT_ULP_CLASS_HID_4af4c = 0x4af4c,
+	BNXT_ULP_CLASS_HID_4a8b8 = 0x4a8b8,
+	BNXT_ULP_CLASS_HID_4e048 = 0x4e048,
+	BNXT_ULP_CLASS_HID_4ae84 = 0x4ae84,
+	BNXT_ULP_CLASS_HID_4e994 = 0x4e994,
+	BNXT_ULP_CLASS_HID_4b2e4 = 0x4b2e4,
+	BNXT_ULP_CLASS_HID_4adf4 = 0x4adf4,
+	BNXT_ULP_CLASS_HID_4b820 = 0x4b820,
+	BNXT_ULP_CLASS_HID_4f330 = 0x4f330,
+	BNXT_ULP_CLASS_HID_1a180 = 0x1a180,
+	BNXT_ULP_CLASS_HID_1f890 = 0x1f890,
+	BNXT_ULP_CLASS_HID_1a7cc = 0x1a7cc,
+	BNXT_ULP_CLASS_HID_1fedc = 0x1fedc,
+	BNXT_ULP_CLASS_HID_1ab2c = 0x1ab2c,
+	BNXT_ULP_CLASS_HID_1a23c = 0x1a23c,
+	BNXT_ULP_CLASS_HID_1b168 = 0x1b168,
+	BNXT_ULP_CLASS_HID_1a878 = 0x1a878,
+	BNXT_ULP_CLASS_HID_1e274 = 0x1e274,
+	BNXT_ULP_CLASS_HID_1be48 = 0x1be48,
+	BNXT_ULP_CLASS_HID_1ebb0 = 0x1ebb0,
+	BNXT_ULP_CLASS_HID_1a794 = 0x1a794,
+	BNXT_ULP_CLASS_HID_1af90 = 0x1af90,
+	BNXT_ULP_CLASS_HID_1e6a0 = 0x1e6a0,
+	BNXT_ULP_CLASS_HID_1f5dc = 0x1f5dc,
+	BNXT_ULP_CLASS_HID_1b130 = 0x1b130,
+	BNXT_ULP_CLASS_HID_5bad4 = 0x5bad4,
+	BNXT_ULP_CLASS_HID_5f5e4 = 0x5f5e4,
+	BNXT_ULP_CLASS_HID_5a010 = 0x5a010,
+	BNXT_ULP_CLASS_HID_5fb20 = 0x5fb20,
+	BNXT_ULP_CLASS_HID_5a470 = 0x5a470,
+	BNXT_ULP_CLASS_HID_5bf00 = 0x5bf00,
+	BNXT_ULP_CLASS_HID_5adbc = 0x5adbc,
+	BNXT_ULP_CLASS_HID_5a54c = 0x5a54c,
+	BNXT_ULP_CLASS_HID_5feb8 = 0x5feb8,
+	BNXT_ULP_CLASS_HID_5ba9c = 0x5ba9c,
+	BNXT_ULP_CLASS_HID_5e484 = 0x5e484,
+	BNXT_ULP_CLASS_HID_5a0d8 = 0x5a0d8,
+	BNXT_ULP_CLASS_HID_5a8e4 = 0x5a8e4,
+	BNXT_ULP_CLASS_HID_5e3f4 = 0x5e3f4,
+	BNXT_ULP_CLASS_HID_5ae20 = 0x5ae20,
+	BNXT_ULP_CLASS_HID_5e930 = 0x5e930,
+	BNXT_ULP_CLASS_HID_ee00 = 0xee00,
+	BNXT_ULP_CLASS_HID_e910 = 0xe910,
+	BNXT_ULP_CLASS_HID_f44c = 0xf44c,
+	BNXT_ULP_CLASS_HID_ef5c = 0xef5c,
+	BNXT_ULP_CLASS_HID_fbac = 0xfbac,
+	BNXT_ULP_CLASS_HID_f2bc = 0xf2bc,
+	BNXT_ULP_CLASS_HID_e1e8 = 0xe1e8,
+	BNXT_ULP_CLASS_HID_f8f8 = 0xf8f8,
+	BNXT_ULP_CLASS_HID_f2f4 = 0xf2f4,
+	BNXT_ULP_CLASS_HID_ed84 = 0xed84,
+	BNXT_ULP_CLASS_HID_f830 = 0xf830,
+	BNXT_ULP_CLASS_HID_f414 = 0xf414,
+	BNXT_ULP_CLASS_HID_fc10 = 0xfc10,
+	BNXT_ULP_CLASS_HID_f720 = 0xf720,
+	BNXT_ULP_CLASS_HID_e25c = 0xe25c,
+	BNXT_ULP_CLASS_HID_fd6c = 0xfd6c,
+	BNXT_ULP_CLASS_HID_4eb54 = 0x4eb54,
+	BNXT_ULP_CLASS_HID_4e264 = 0x4e264,
+	BNXT_ULP_CLASS_HID_4f090 = 0x4f090,
+	BNXT_ULP_CLASS_HID_4eba0 = 0x4eba0,
+	BNXT_ULP_CLASS_HID_4f4f0 = 0x4f4f0,
+	BNXT_ULP_CLASS_HID_4ef80 = 0x4ef80,
+	BNXT_ULP_CLASS_HID_4fa3c = 0x4fa3c,
+	BNXT_ULP_CLASS_HID_4f5cc = 0x4f5cc,
+	BNXT_ULP_CLASS_HID_4ef38 = 0x4ef38,
+	BNXT_ULP_CLASS_HID_4e6c8 = 0x4e6c8,
+	BNXT_ULP_CLASS_HID_4f504 = 0x4f504,
+	BNXT_ULP_CLASS_HID_4f158 = 0x4f158,
+	BNXT_ULP_CLASS_HID_4f964 = 0x4f964,
+	BNXT_ULP_CLASS_HID_4f074 = 0x4f074,
+	BNXT_ULP_CLASS_HID_4fea0 = 0x4fea0,
+	BNXT_ULP_CLASS_HID_4f9b0 = 0x4f9b0,
+	BNXT_ULP_CLASS_HID_1e400 = 0x1e400,
+	BNXT_ULP_CLASS_HID_1ff10 = 0x1ff10,
+	BNXT_ULP_CLASS_HID_1ea4c = 0x1ea4c,
+	BNXT_ULP_CLASS_HID_1e55c = 0x1e55c,
+	BNXT_ULP_CLASS_HID_1f1ac = 0x1f1ac,
+	BNXT_ULP_CLASS_HID_1e8bc = 0x1e8bc,
+	BNXT_ULP_CLASS_HID_1f7e8 = 0x1f7e8,
+	BNXT_ULP_CLASS_HID_1eef8 = 0x1eef8,
+	BNXT_ULP_CLASS_HID_1e8f4 = 0x1e8f4,
+	BNXT_ULP_CLASS_HID_1e4c8 = 0x1e4c8,
+	BNXT_ULP_CLASS_HID_1f304 = 0x1f304,
+	BNXT_ULP_CLASS_HID_1ea14 = 0x1ea14,
+	BNXT_ULP_CLASS_HID_1f210 = 0x1f210,
+	BNXT_ULP_CLASS_HID_1ed20 = 0x1ed20,
+	BNXT_ULP_CLASS_HID_1f85c = 0x1f85c,
+	BNXT_ULP_CLASS_HID_1f7b0 = 0x1f7b0,
+	BNXT_ULP_CLASS_HID_5e154 = 0x5e154,
+	BNXT_ULP_CLASS_HID_5f864 = 0x5f864,
+	BNXT_ULP_CLASS_HID_5e690 = 0x5e690,
+	BNXT_ULP_CLASS_HID_5e1a0 = 0x5e1a0,
+	BNXT_ULP_CLASS_HID_5eaf0 = 0x5eaf0,
+	BNXT_ULP_CLASS_HID_5e580 = 0x5e580,
+	BNXT_ULP_CLASS_HID_5f03c = 0x5f03c,
+	BNXT_ULP_CLASS_HID_5ebcc = 0x5ebcc,
+	BNXT_ULP_CLASS_HID_5e538 = 0x5e538,
+	BNXT_ULP_CLASS_HID_5e11c = 0x5e11c,
+	BNXT_ULP_CLASS_HID_5eb04 = 0x5eb04,
+	BNXT_ULP_CLASS_HID_5e758 = 0x5e758,
+	BNXT_ULP_CLASS_HID_5ef64 = 0x5ef64,
+	BNXT_ULP_CLASS_HID_5e674 = 0x5e674,
+	BNXT_ULP_CLASS_HID_5f4a0 = 0x5f4a0,
+	BNXT_ULP_CLASS_HID_5f084 = 0x5f084,
+	BNXT_ULP_CLASS_HID_22998 = 0x22998,
+	BNXT_ULP_CLASS_HID_24088 = 0x24088,
+	BNXT_ULP_CLASS_HID_22f54 = 0x22f54,
 	BNXT_ULP_CLASS_HID_24644 = 0x24644,
-	BNXT_ULP_CLASS_HID_29438 = 0x29438,
-	BNXT_ULP_CLASS_HID_30138 = 0x30138,
-	BNXT_ULP_CLASS_HID_38a38 = 0x38a38,
-	BNXT_ULP_CLASS_HID_25594 = 0x25594,
-	BNXT_ULP_CLASS_HID_2de94 = 0x2de94,
-	BNXT_ULP_CLASS_HID_34b94 = 0x34b94,
-	BNXT_ULP_CLASS_HID_39948 = 0x39948,
-	BNXT_ULP_CLASS_HID_22e48 = 0x22e48,
-	BNXT_ULP_CLASS_HID_2db48 = 0x2db48,
-	BNXT_ULP_CLASS_HID_34448 = 0x34448,
-	BNXT_ULP_CLASS_HID_3923c = 0x3923c,
-	BNXT_ULP_CLASS_HID_24338 = 0x24338,
-	BNXT_ULP_CLASS_HID_290ec = 0x290ec,
-	BNXT_ULP_CLASS_HID_31dec = 0x31dec,
-	BNXT_ULP_CLASS_HID_386ec = 0x386ec,
-	BNXT_ULP_CLASS_HID_20f8c = 0x20f8c,
-	BNXT_ULP_CLASS_HID_2b88c = 0x2b88c,
-	BNXT_ULP_CLASS_HID_3258c = 0x3258c,
-	BNXT_ULP_CLASS_HID_3ae8c = 0x3ae8c,
-	BNXT_ULP_CLASS_HID_21adc = 0x21adc,
-	BNXT_ULP_CLASS_HID_287dc = 0x287dc,
-	BNXT_ULP_CLASS_HID_330dc = 0x330dc,
-	BNXT_ULP_CLASS_HID_3bddc = 0x3bddc,
-	BNXT_ULP_CLASS_HID_21790 = 0x21790,
-	BNXT_ULP_CLASS_HID_28090 = 0x28090,
-	BNXT_ULP_CLASS_HID_30d90 = 0x30d90,
-	BNXT_ULP_CLASS_HID_3b690 = 0x3b690,
-	BNXT_ULP_CLASS_HID_20840 = 0x20840,
-	BNXT_ULP_CLASS_HID_2b540 = 0x2b540,
-	BNXT_ULP_CLASS_HID_33e40 = 0x33e40,
-	BNXT_ULP_CLASS_HID_3ab40 = 0x3ab40,
+	BNXT_ULP_CLASS_HID_23334 = 0x23334,
+	BNXT_ULP_CLASS_HID_22a24 = 0x22a24,
+	BNXT_ULP_CLASS_HID_238f0 = 0x238f0,
 	BNXT_ULP_CLASS_HID_253e0 = 0x253e0,
-	BNXT_ULP_CLASS_HID_2dce0 = 0x2dce0,
-	BNXT_ULP_CLASS_HID_349e0 = 0x349e0,
-	BNXT_ULP_CLASS_HID_397d4 = 0x397d4,
-	BNXT_ULP_CLASS_HID_23f30 = 0x23f30,
-	BNXT_ULP_CLASS_HID_2a830 = 0x2a830,
-	BNXT_ULP_CLASS_HID_35530 = 0x35530,
-	BNXT_ULP_CLASS_HID_3de30 = 0x3de30,
-	BNXT_ULP_CLASS_HID_23be4 = 0x23be4,
-	BNXT_ULP_CLASS_HID_2a4e4 = 0x2a4e4,
-	BNXT_ULP_CLASS_HID_351e4 = 0x351e4,
-	BNXT_ULP_CLASS_HID_3dae4 = 0x3dae4,
-	BNXT_ULP_CLASS_HID_22cd4 = 0x22cd4,
-	BNXT_ULP_CLASS_HID_2d9d4 = 0x2d9d4,
-	BNXT_ULP_CLASS_HID_342d4 = 0x342d4,
-	BNXT_ULP_CLASS_HID_39088 = 0x39088,
+	BNXT_ULP_CLASS_HID_24dec = 0x24dec,
+	BNXT_ULP_CLASS_HID_209d0 = 0x209d0,
+	BNXT_ULP_CLASS_HID_2149c = 0x2149c,
+	BNXT_ULP_CLASS_HID_20f8c = 0x20f8c,
+	BNXT_ULP_CLASS_HID_25788 = 0x25788,
+	BNXT_ULP_CLASS_HID_2136c = 0x2136c,
+	BNXT_ULP_CLASS_HID_25d44 = 0x25d44,
 	BNXT_ULP_CLASS_HID_21928 = 0x21928,
-	BNXT_ULP_CLASS_HID_28228 = 0x28228,
-	BNXT_ULP_CLASS_HID_30f28 = 0x30f28,
-	BNXT_ULP_CLASS_HID_3b828 = 0x3b828,
-	BNXT_ULP_CLASS_HID_24384 = 0x24384,
-	BNXT_ULP_CLASS_HID_29178 = 0x29178,
-	BNXT_ULP_CLASS_HID_31a78 = 0x31a78,
-	BNXT_ULP_CLASS_HID_38778 = 0x38778,
-	BNXT_ULP_CLASS_HID_25c78 = 0x25c78,
-	BNXT_ULP_CLASS_HID_2c978 = 0x2c978,
-	BNXT_ULP_CLASS_HID_3172c = 0x3172c,
-	BNXT_ULP_CLASS_HID_3802c = 0x3802c,
-	BNXT_ULP_CLASS_HID_2121c = 0x2121c,
-	BNXT_ULP_CLASS_HID_29f1c = 0x29f1c,
-	BNXT_ULP_CLASS_HID_3081c = 0x3081c,
-	BNXT_ULP_CLASS_HID_3b51c = 0x3b51c,
-	BNXT_ULP_CLASS_HID_24088 = 0x24088,
-	BNXT_ULP_CLASS_HID_2cd88 = 0x2cd88,
-	BNXT_ULP_CLASS_HID_31b7c = 0x31b7c,
-	BNXT_ULP_CLASS_HID_3847c = 0x3847c,
+	BNXT_ULP_CLASS_HID_234a8 = 0x234a8,
 	BNXT_ULP_CLASS_HID_22fd8 = 0x22fd8,
-	BNXT_ULP_CLASS_HID_2d8d8 = 0x2d8d8,
-	BNXT_ULP_CLASS_HID_345d8 = 0x345d8,
-	BNXT_ULP_CLASS_HID_3938c = 0x3938c,
-	BNXT_ULP_CLASS_HID_2288c = 0x2288c,
-	BNXT_ULP_CLASS_HID_2d58c = 0x2d58c,
-	BNXT_ULP_CLASS_HID_35e8c = 0x35e8c,
-	BNXT_ULP_CLASS_HID_3cb8c = 0x3cb8c,
-	BNXT_ULP_CLASS_HID_25d7c = 0x25d7c,
-	BNXT_ULP_CLASS_HID_2c67c = 0x2c67c,
-	BNXT_ULP_CLASS_HID_31430 = 0x31430,
-	BNXT_ULP_CLASS_HID_38130 = 0x38130,
-	BNXT_ULP_CLASS_HID_209d0 = 0x209d0,
-	BNXT_ULP_CLASS_HID_2b2d0 = 0x2b2d0,
-	BNXT_ULP_CLASS_HID_33fd0 = 0x33fd0,
-	BNXT_ULP_CLASS_HID_3a8d0 = 0x3a8d0,
-	BNXT_ULP_CLASS_HID_214e0 = 0x214e0,
-	BNXT_ULP_CLASS_HID_281e0 = 0x281e0,
-	BNXT_ULP_CLASS_HID_30ae0 = 0x30ae0,
-	BNXT_ULP_CLASS_HID_3b7e0 = 0x3b7e0,
-	BNXT_ULP_CLASS_HID_211d4 = 0x211d4,
-	BNXT_ULP_CLASS_HID_29ad4 = 0x29ad4,
-	BNXT_ULP_CLASS_HID_307d4 = 0x307d4,
-	BNXT_ULP_CLASS_HID_3b0d4 = 0x3b0d4,
-	BNXT_ULP_CLASS_HID_20284 = 0x20284,
-	BNXT_ULP_CLASS_HID_28f84 = 0x28f84,
-	BNXT_ULP_CLASS_HID_33884 = 0x33884,
-	BNXT_ULP_CLASS_HID_3a584 = 0x3a584,
-	BNXT_ULP_CLASS_HID_22a24 = 0x22a24,
-	BNXT_ULP_CLASS_HID_2d724 = 0x2d724,
-	BNXT_ULP_CLASS_HID_34024 = 0x34024,
-	BNXT_ULP_CLASS_HID_3cd24 = 0x3cd24,
+	BNXT_ULP_CLASS_HID_23a64 = 0x23a64,
+	BNXT_ULP_CLASS_HID_25594 = 0x25594,
+	BNXT_ULP_CLASS_HID_21e44 = 0x21e44,
 	BNXT_ULP_CLASS_HID_23974 = 0x23974,
-	BNXT_ULP_CLASS_HID_2a274 = 0x2a274,
-	BNXT_ULP_CLASS_HID_32f74 = 0x32f74,
-	BNXT_ULP_CLASS_HID_3d874 = 0x3d874,
-	BNXT_ULP_CLASS_HID_23228 = 0x23228,
-	BNXT_ULP_CLASS_HID_2bf28 = 0x2bf28,
-	BNXT_ULP_CLASS_HID_32828 = 0x32828,
-	BNXT_ULP_CLASS_HID_3d528 = 0x3d528,
-	BNXT_ULP_CLASS_HID_22718 = 0x22718,
-	BNXT_ULP_CLASS_HID_2d018 = 0x2d018,
-	BNXT_ULP_CLASS_HID_35d18 = 0x35d18,
-	BNXT_ULP_CLASS_HID_3c618 = 0x3c618,
-	BNXT_ULP_CLASS_HID_2136c = 0x2136c,
-	BNXT_ULP_CLASS_HID_29c6c = 0x29c6c,
-	BNXT_ULP_CLASS_HID_3096c = 0x3096c,
-	BNXT_ULP_CLASS_HID_3b26c = 0x3b26c,
+	BNXT_ULP_CLASS_HID_20400 = 0x20400,
+	BNXT_ULP_CLASS_HID_23f30 = 0x23f30,
+	BNXT_ULP_CLASS_HID_2593c = 0x2593c,
+	BNXT_ULP_CLASS_HID_214e0 = 0x214e0,
+	BNXT_ULP_CLASS_HID_25ef8 = 0x25ef8,
+	BNXT_ULP_CLASS_HID_21adc = 0x21adc,
+	BNXT_ULP_CLASS_HID_222d8 = 0x222d8,
 	BNXT_ULP_CLASS_HID_25dc8 = 0x25dc8,
-	BNXT_ULP_CLASS_HID_2c6c8 = 0x2c6c8,
-	BNXT_ULP_CLASS_HID_314bc = 0x314bc,
-	BNXT_ULP_CLASS_HID_381bc = 0x381bc,
-	BNXT_ULP_CLASS_HID_256bc = 0x256bc,
-	BNXT_ULP_CLASS_HID_2c3bc = 0x2c3bc,
-	BNXT_ULP_CLASS_HID_31170 = 0x31170,
-	BNXT_ULP_CLASS_HID_39a70 = 0x39a70,
-	BNXT_ULP_CLASS_HID_24b6c = 0x24b6c,
-	BNXT_ULP_CLASS_HID_29920 = 0x29920,
-	BNXT_ULP_CLASS_HID_30220 = 0x30220,
-	BNXT_ULP_CLASS_HID_38f20 = 0x38f20,
-	BNXT_ULP_CLASS_HID_22f54 = 0x22f54,
-	BNXT_ULP_CLASS_HID_2d854 = 0x2d854,
+	BNXT_ULP_CLASS_HID_22894 = 0x22894,
+	BNXT_ULP_CLASS_HID_24384 = 0x24384,
+	BNXT_ULP_CLASS_HID_6224c = 0x6224c,
+	BNXT_ULP_CLASS_HID_65d7c = 0x65d7c,
+	BNXT_ULP_CLASS_HID_62808 = 0x62808,
+	BNXT_ULP_CLASS_HID_64338 = 0x64338,
+	BNXT_ULP_CLASS_HID_60fe8 = 0x60fe8,
+	BNXT_ULP_CLASS_HID_62718 = 0x62718,
+	BNXT_ULP_CLASS_HID_635a4 = 0x635a4,
+	BNXT_ULP_CLASS_HID_62cd4 = 0x62cd4,
+	BNXT_ULP_CLASS_HID_646a0 = 0x646a0,
+	BNXT_ULP_CLASS_HID_60284 = 0x60284,
+	BNXT_ULP_CLASS_HID_61150 = 0x61150,
+	BNXT_ULP_CLASS_HID_60840 = 0x60840,
+	BNXT_ULP_CLASS_HID_6507c = 0x6507c,
+	BNXT_ULP_CLASS_HID_64b6c = 0x64b6c,
+	BNXT_ULP_CLASS_HID_65638 = 0x65638,
+	BNXT_ULP_CLASS_HID_6121c = 0x6121c,
+	BNXT_ULP_CLASS_HID_6319c = 0x6319c,
+	BNXT_ULP_CLASS_HID_6288c = 0x6288c,
+	BNXT_ULP_CLASS_HID_63758 = 0x63758,
+	BNXT_ULP_CLASS_HID_62e48 = 0x62e48,
+	BNXT_ULP_CLASS_HID_61b38 = 0x61b38,
+	BNXT_ULP_CLASS_HID_63228 = 0x63228,
+	BNXT_ULP_CLASS_HID_600f4 = 0x600f4,
+	BNXT_ULP_CLASS_HID_63be4 = 0x63be4,
+	BNXT_ULP_CLASS_HID_655f0 = 0x655f0,
+	BNXT_ULP_CLASS_HID_611d4 = 0x611d4,
+	BNXT_ULP_CLASS_HID_65bac = 0x65bac,
+	BNXT_ULP_CLASS_HID_61790 = 0x61790,
+	BNXT_ULP_CLASS_HID_63f8c = 0x63f8c,
+	BNXT_ULP_CLASS_HID_656bc = 0x656bc,
+	BNXT_ULP_CLASS_HID_62548 = 0x62548,
+	BNXT_ULP_CLASS_HID_65c78 = 0x65c78,
+	BNXT_ULP_CLASS_HID_35f98 = 0x35f98,
+	BNXT_ULP_CLASS_HID_31b7c = 0x31b7c,
 	BNXT_ULP_CLASS_HID_34554 = 0x34554,
-	BNXT_ULP_CLASS_HID_39308 = 0x39308,
-	BNXT_ULP_CLASS_HID_23a64 = 0x23a64,
-	BNXT_ULP_CLASS_HID_2a764 = 0x2a764,
-	BNXT_ULP_CLASS_HID_35064 = 0x35064,
-	BNXT_ULP_CLASS_HID_3dd64 = 0x3dd64,
-	BNXT_ULP_CLASS_HID_23758 = 0x23758,
-	BNXT_ULP_CLASS_HID_2a058 = 0x2a058,
-	BNXT_ULP_CLASS_HID_32d58 = 0x32d58,
-	BNXT_ULP_CLASS_HID_3d658 = 0x3d658,
-	BNXT_ULP_CLASS_HID_22808 = 0x22808,
-	BNXT_ULP_CLASS_HID_2d508 = 0x2d508,
-	BNXT_ULP_CLASS_HID_35e08 = 0x35e08,
-	BNXT_ULP_CLASS_HID_3cb08 = 0x3cb08,
-	BNXT_ULP_CLASS_HID_2149c = 0x2149c,
-	BNXT_ULP_CLASS_HID_2819c = 0x2819c,
-	BNXT_ULP_CLASS_HID_30a9c = 0x30a9c,
-	BNXT_ULP_CLASS_HID_3b79c = 0x3b79c,
-	BNXT_ULP_CLASS_HID_25ef8 = 0x25ef8,
-	BNXT_ULP_CLASS_HID_2cbf8 = 0x2cbf8,
-	BNXT_ULP_CLASS_HID_319ac = 0x319ac,
-	BNXT_ULP_CLASS_HID_382ac = 0x382ac,
-	BNXT_ULP_CLASS_HID_25bac = 0x25bac,
-	BNXT_ULP_CLASS_HID_2c4ac = 0x2c4ac,
-	BNXT_ULP_CLASS_HID_31260 = 0x31260,
-	BNXT_ULP_CLASS_HID_39f60 = 0x39f60,
-	BNXT_ULP_CLASS_HID_21150 = 0x21150,
-	BNXT_ULP_CLASS_HID_29a50 = 0x29a50,
-	BNXT_ULP_CLASS_HID_30750 = 0x30750,
-	BNXT_ULP_CLASS_HID_3b050 = 0x3b050,
-	BNXT_ULP_CLASS_HID_238f0 = 0x238f0,
-	BNXT_ULP_CLASS_HID_2a5f0 = 0x2a5f0,
+	BNXT_ULP_CLASS_HID_30138 = 0x30138,
+	BNXT_ULP_CLASS_HID_32934 = 0x32934,
+	BNXT_ULP_CLASS_HID_34024 = 0x34024,
 	BNXT_ULP_CLASS_HID_32ef0 = 0x32ef0,
-	BNXT_ULP_CLASS_HID_3dbf0 = 0x3dbf0,
-	BNXT_ULP_CLASS_HID_20400 = 0x20400,
-	BNXT_ULP_CLASS_HID_2b100 = 0x2b100,
-	BNXT_ULP_CLASS_HID_33a00 = 0x33a00,
-	BNXT_ULP_CLASS_HID_3a700 = 0x3a700,
-	BNXT_ULP_CLASS_HID_200f4 = 0x200f4,
-	BNXT_ULP_CLASS_HID_28df4 = 0x28df4,
-	BNXT_ULP_CLASS_HID_336f4 = 0x336f4,
-	BNXT_ULP_CLASS_HID_3a3f4 = 0x3a3f4,
-	BNXT_ULP_CLASS_HID_235a4 = 0x235a4,
-	BNXT_ULP_CLASS_HID_2bea4 = 0x2bea4,
-	BNXT_ULP_CLASS_HID_32ba4 = 0x32ba4,
-	BNXT_ULP_CLASS_HID_3d4a4 = 0x3d4a4,
-	BNXT_ULP_CLASS_HID_25d44 = 0x25d44,
-	BNXT_ULP_CLASS_HID_2c644 = 0x2c644,
+	BNXT_ULP_CLASS_HID_349e0 = 0x349e0,
+	BNXT_ULP_CLASS_HID_304a0 = 0x304a0,
+	BNXT_ULP_CLASS_HID_33fd0 = 0x33fd0,
+	BNXT_ULP_CLASS_HID_30a9c = 0x30a9c,
+	BNXT_ULP_CLASS_HID_3258c = 0x3258c,
+	BNXT_ULP_CLASS_HID_34d88 = 0x34d88,
+	BNXT_ULP_CLASS_HID_3096c = 0x3096c,
 	BNXT_ULP_CLASS_HID_31438 = 0x31438,
-	BNXT_ULP_CLASS_HID_38138 = 0x38138,
-	BNXT_ULP_CLASS_HID_22894 = 0x22894,
-	BNXT_ULP_CLASS_HID_2d594 = 0x2d594,
+	BNXT_ULP_CLASS_HID_30f28 = 0x30f28,
+	BNXT_ULP_CLASS_HID_32aa8 = 0x32aa8,
+	BNXT_ULP_CLASS_HID_345d8 = 0x345d8,
+	BNXT_ULP_CLASS_HID_35064 = 0x35064,
+	BNXT_ULP_CLASS_HID_34b94 = 0x34b94,
+	BNXT_ULP_CLASS_HID_33444 = 0x33444,
+	BNXT_ULP_CLASS_HID_32f74 = 0x32f74,
+	BNXT_ULP_CLASS_HID_33a00 = 0x33a00,
+	BNXT_ULP_CLASS_HID_35530 = 0x35530,
+	BNXT_ULP_CLASS_HID_313f0 = 0x313f0,
+	BNXT_ULP_CLASS_HID_30ae0 = 0x30ae0,
+	BNXT_ULP_CLASS_HID_319ac = 0x319ac,
+	BNXT_ULP_CLASS_HID_330dc = 0x330dc,
+	BNXT_ULP_CLASS_HID_358d8 = 0x358d8,
+	BNXT_ULP_CLASS_HID_314bc = 0x314bc,
 	BNXT_ULP_CLASS_HID_35e94 = 0x35e94,
-	BNXT_ULP_CLASS_HID_3cb94 = 0x3cb94,
-	BNXT_ULP_CLASS_HID_22548 = 0x22548,
-	BNXT_ULP_CLASS_HID_2ae48 = 0x2ae48,
-	BNXT_ULP_CLASS_HID_35b48 = 0x35b48,
-	BNXT_ULP_CLASS_HID_3c448 = 0x3c448,
-	BNXT_ULP_CLASS_HID_25638 = 0x25638,
-	BNXT_ULP_CLASS_HID_2c338 = 0x2c338,
-	BNXT_ULP_CLASS_HID_310ec = 0x310ec,
-	BNXT_ULP_CLASS_HID_39dec = 0x39dec,
-	BNXT_ULP_CLASS_HID_22998 = 0x22998,
+	BNXT_ULP_CLASS_HID_31a78 = 0x31a78,
+	BNXT_ULP_CLASS_HID_7584c = 0x7584c,
+	BNXT_ULP_CLASS_HID_71430 = 0x71430,
+	BNXT_ULP_CLASS_HID_75e08 = 0x75e08,
+	BNXT_ULP_CLASS_HID_71dec = 0x71dec,
+	BNXT_ULP_CLASS_HID_725e8 = 0x725e8,
+	BNXT_ULP_CLASS_HID_75d18 = 0x75d18,
+	BNXT_ULP_CLASS_HID_72ba4 = 0x72ba4,
+	BNXT_ULP_CLASS_HID_742d4 = 0x742d4,
+	BNXT_ULP_CLASS_HID_70194 = 0x70194,
+	BNXT_ULP_CLASS_HID_73884 = 0x73884,
+	BNXT_ULP_CLASS_HID_70750 = 0x70750,
+	BNXT_ULP_CLASS_HID_73e40 = 0x73e40,
+	BNXT_ULP_CLASS_HID_7467c = 0x7467c,
+	BNXT_ULP_CLASS_HID_70220 = 0x70220,
+	BNXT_ULP_CLASS_HID_710ec = 0x710ec,
+	BNXT_ULP_CLASS_HID_7081c = 0x7081c,
+	BNXT_ULP_CLASS_HID_7279c = 0x7279c,
+	BNXT_ULP_CLASS_HID_75e8c = 0x75e8c,
+	BNXT_ULP_CLASS_HID_72d58 = 0x72d58,
+	BNXT_ULP_CLASS_HID_74448 = 0x74448,
+	BNXT_ULP_CLASS_HID_73138 = 0x73138,
+	BNXT_ULP_CLASS_HID_72828 = 0x72828,
+	BNXT_ULP_CLASS_HID_736f4 = 0x736f4,
+	BNXT_ULP_CLASS_HID_751e4 = 0x751e4,
+	BNXT_ULP_CLASS_HID_74bf0 = 0x74bf0,
+	BNXT_ULP_CLASS_HID_707d4 = 0x707d4,
+	BNXT_ULP_CLASS_HID_71260 = 0x71260,
+	BNXT_ULP_CLASS_HID_70d90 = 0x70d90,
+	BNXT_ULP_CLASS_HID_7558c = 0x7558c,
+	BNXT_ULP_CLASS_HID_71170 = 0x71170,
+	BNXT_ULP_CLASS_HID_75b48 = 0x75b48,
+	BNXT_ULP_CLASS_HID_7172c = 0x7172c,
 	BNXT_ULP_CLASS_HID_2d298 = 0x2d298,
-	BNXT_ULP_CLASS_HID_35f98 = 0x35f98,
-	BNXT_ULP_CLASS_HID_3c898 = 0x3c898,
-	BNXT_ULP_CLASS_HID_234a8 = 0x234a8,
-	BNXT_ULP_CLASS_HID_2a1a8 = 0x2a1a8,
-	BNXT_ULP_CLASS_HID_32aa8 = 0x32aa8,
-	BNXT_ULP_CLASS_HID_3d7a8 = 0x3d7a8,
-	BNXT_ULP_CLASS_HID_2319c = 0x2319c,
-	BNXT_ULP_CLASS_HID_2ba9c = 0x2ba9c,
-	BNXT_ULP_CLASS_HID_3279c = 0x3279c,
-	BNXT_ULP_CLASS_HID_3d09c = 0x3d09c,
-	BNXT_ULP_CLASS_HID_2224c = 0x2224c,
-	BNXT_ULP_CLASS_HID_2af4c = 0x2af4c,
-	BNXT_ULP_CLASS_HID_3584c = 0x3584c,
-	BNXT_ULP_CLASS_HID_3c54c = 0x3c54c,
-	BNXT_ULP_CLASS_HID_24dec = 0x24dec,
+	BNXT_ULP_CLASS_HID_2cd88 = 0x2cd88,
+	BNXT_ULP_CLASS_HID_2d854 = 0x2d854,
+	BNXT_ULP_CLASS_HID_29438 = 0x29438,
+	BNXT_ULP_CLASS_HID_2bc34 = 0x2bc34,
+	BNXT_ULP_CLASS_HID_2d724 = 0x2d724,
+	BNXT_ULP_CLASS_HID_2a5f0 = 0x2a5f0,
+	BNXT_ULP_CLASS_HID_2dce0 = 0x2dce0,
 	BNXT_ULP_CLASS_HID_29ba0 = 0x29ba0,
-	BNXT_ULP_CLASS_HID_304a0 = 0x304a0,
-	BNXT_ULP_CLASS_HID_3b1a0 = 0x3b1a0,
-	BNXT_ULP_CLASS_HID_2593c = 0x2593c,
+	BNXT_ULP_CLASS_HID_2b2d0 = 0x2b2d0,
+	BNXT_ULP_CLASS_HID_2819c = 0x2819c,
+	BNXT_ULP_CLASS_HID_2b88c = 0x2b88c,
+	BNXT_ULP_CLASS_HID_2c088 = 0x2c088,
+	BNXT_ULP_CLASS_HID_29c6c = 0x29c6c,
+	BNXT_ULP_CLASS_HID_2c644 = 0x2c644,
+	BNXT_ULP_CLASS_HID_28228 = 0x28228,
+	BNXT_ULP_CLASS_HID_2a1a8 = 0x2a1a8,
+	BNXT_ULP_CLASS_HID_2d8d8 = 0x2d8d8,
+	BNXT_ULP_CLASS_HID_2a764 = 0x2a764,
+	BNXT_ULP_CLASS_HID_2de94 = 0x2de94,
+	BNXT_ULP_CLASS_HID_28b44 = 0x28b44,
+	BNXT_ULP_CLASS_HID_2a274 = 0x2a274,
+	BNXT_ULP_CLASS_HID_2b100 = 0x2b100,
+	BNXT_ULP_CLASS_HID_2a830 = 0x2a830,
 	BNXT_ULP_CLASS_HID_2c23c = 0x2c23c,
-	BNXT_ULP_CLASS_HID_313f0 = 0x313f0,
-	BNXT_ULP_CLASS_HID_39cf0 = 0x39cf0,
-	BNXT_ULP_CLASS_HID_255f0 = 0x255f0,
-	BNXT_ULP_CLASS_HID_2def0 = 0x2def0,
-	BNXT_ULP_CLASS_HID_34bf0 = 0x34bf0,
-	BNXT_ULP_CLASS_HID_399a4 = 0x399a4,
-	BNXT_ULP_CLASS_HID_246a0 = 0x246a0,
-	BNXT_ULP_CLASS_HID_29494 = 0x29494,
-	BNXT_ULP_CLASS_HID_30194 = 0x30194,
-	BNXT_ULP_CLASS_HID_38a94 = 0x38a94,
-	BNXT_ULP_CLASS_HID_23334 = 0x23334,
-	BNXT_ULP_CLASS_HID_2bc34 = 0x2bc34,
-	BNXT_ULP_CLASS_HID_32934 = 0x32934,
+	BNXT_ULP_CLASS_HID_281e0 = 0x281e0,
+	BNXT_ULP_CLASS_HID_2cbf8 = 0x2cbf8,
+	BNXT_ULP_CLASS_HID_287dc = 0x287dc,
+	BNXT_ULP_CLASS_HID_2afd8 = 0x2afd8,
+	BNXT_ULP_CLASS_HID_2c6c8 = 0x2c6c8,
+	BNXT_ULP_CLASS_HID_2d594 = 0x2d594,
+	BNXT_ULP_CLASS_HID_29178 = 0x29178,
+	BNXT_ULP_CLASS_HID_6af4c = 0x6af4c,
+	BNXT_ULP_CLASS_HID_6c67c = 0x6c67c,
+	BNXT_ULP_CLASS_HID_6d508 = 0x6d508,
+	BNXT_ULP_CLASS_HID_690ec = 0x690ec,
+	BNXT_ULP_CLASS_HID_6b8e8 = 0x6b8e8,
+	BNXT_ULP_CLASS_HID_6d018 = 0x6d018,
+	BNXT_ULP_CLASS_HID_6bea4 = 0x6bea4,
+	BNXT_ULP_CLASS_HID_6d9d4 = 0x6d9d4,
+	BNXT_ULP_CLASS_HID_69494 = 0x69494,
+	BNXT_ULP_CLASS_HID_68f84 = 0x68f84,
+	BNXT_ULP_CLASS_HID_69a50 = 0x69a50,
+	BNXT_ULP_CLASS_HID_6b540 = 0x6b540,
+	BNXT_ULP_CLASS_HID_6dd7c = 0x6dd7c,
+	BNXT_ULP_CLASS_HID_69920 = 0x69920,
+	BNXT_ULP_CLASS_HID_6c338 = 0x6c338,
+	BNXT_ULP_CLASS_HID_69f1c = 0x69f1c,
+	BNXT_ULP_CLASS_HID_6ba9c = 0x6ba9c,
+	BNXT_ULP_CLASS_HID_6d58c = 0x6d58c,
+	BNXT_ULP_CLASS_HID_6a058 = 0x6a058,
+	BNXT_ULP_CLASS_HID_6db48 = 0x6db48,
+	BNXT_ULP_CLASS_HID_68438 = 0x68438,
+	BNXT_ULP_CLASS_HID_6bf28 = 0x6bf28,
+	BNXT_ULP_CLASS_HID_68df4 = 0x68df4,
+	BNXT_ULP_CLASS_HID_6a4e4 = 0x6a4e4,
+	BNXT_ULP_CLASS_HID_6def0 = 0x6def0,
+	BNXT_ULP_CLASS_HID_69ad4 = 0x69ad4,
+	BNXT_ULP_CLASS_HID_6c4ac = 0x6c4ac,
+	BNXT_ULP_CLASS_HID_68090 = 0x68090,
+	BNXT_ULP_CLASS_HID_6a88c = 0x6a88c,
+	BNXT_ULP_CLASS_HID_6c3bc = 0x6c3bc,
+	BNXT_ULP_CLASS_HID_6ae48 = 0x6ae48,
+	BNXT_ULP_CLASS_HID_6c978 = 0x6c978,
+	BNXT_ULP_CLASS_HID_3c898 = 0x3c898,
+	BNXT_ULP_CLASS_HID_3847c = 0x3847c,
+	BNXT_ULP_CLASS_HID_39308 = 0x39308,
+	BNXT_ULP_CLASS_HID_38a38 = 0x38a38,
 	BNXT_ULP_CLASS_HID_3d234 = 0x3d234,
-	BNXT_ULP_CLASS_HID_21e44 = 0x21e44,
-	BNXT_ULP_CLASS_HID_28b44 = 0x28b44,
-	BNXT_ULP_CLASS_HID_33444 = 0x33444,
-	BNXT_ULP_CLASS_HID_3a144 = 0x3a144,
-	BNXT_ULP_CLASS_HID_21b38 = 0x21b38,
-	BNXT_ULP_CLASS_HID_28438 = 0x28438,
-	BNXT_ULP_CLASS_HID_33138 = 0x33138,
-	BNXT_ULP_CLASS_HID_3ba38 = 0x3ba38,
-	BNXT_ULP_CLASS_HID_20fe8 = 0x20fe8,
-	BNXT_ULP_CLASS_HID_2b8e8 = 0x2b8e8,
-	BNXT_ULP_CLASS_HID_325e8 = 0x325e8,
-	BNXT_ULP_CLASS_HID_3aee8 = 0x3aee8,
-	BNXT_ULP_CLASS_HID_25788 = 0x25788,
-	BNXT_ULP_CLASS_HID_2c088 = 0x2c088,
-	BNXT_ULP_CLASS_HID_34d88 = 0x34d88,
+	BNXT_ULP_CLASS_HID_3cd24 = 0x3cd24,
+	BNXT_ULP_CLASS_HID_3dbf0 = 0x3dbf0,
+	BNXT_ULP_CLASS_HID_397d4 = 0x397d4,
+	BNXT_ULP_CLASS_HID_3b1a0 = 0x3b1a0,
+	BNXT_ULP_CLASS_HID_3a8d0 = 0x3a8d0,
+	BNXT_ULP_CLASS_HID_3b79c = 0x3b79c,
+	BNXT_ULP_CLASS_HID_3ae8c = 0x3ae8c,
 	BNXT_ULP_CLASS_HID_39b7c = 0x39b7c,
-	BNXT_ULP_CLASS_HID_222d8 = 0x222d8,
-	BNXT_ULP_CLASS_HID_2afd8 = 0x2afd8,
-	BNXT_ULP_CLASS_HID_358d8 = 0x358d8,
+	BNXT_ULP_CLASS_HID_3b26c = 0x3b26c,
+	BNXT_ULP_CLASS_HID_38138 = 0x38138,
+	BNXT_ULP_CLASS_HID_3b828 = 0x3b828,
+	BNXT_ULP_CLASS_HID_3d7a8 = 0x3d7a8,
+	BNXT_ULP_CLASS_HID_3938c = 0x3938c,
+	BNXT_ULP_CLASS_HID_3dd64 = 0x3dd64,
+	BNXT_ULP_CLASS_HID_39948 = 0x39948,
+	BNXT_ULP_CLASS_HID_3a144 = 0x3a144,
+	BNXT_ULP_CLASS_HID_3d874 = 0x3d874,
+	BNXT_ULP_CLASS_HID_3a700 = 0x3a700,
+	BNXT_ULP_CLASS_HID_3de30 = 0x3de30,
+	BNXT_ULP_CLASS_HID_39cf0 = 0x39cf0,
+	BNXT_ULP_CLASS_HID_3b7e0 = 0x3b7e0,
+	BNXT_ULP_CLASS_HID_382ac = 0x382ac,
+	BNXT_ULP_CLASS_HID_3bddc = 0x3bddc,
 	BNXT_ULP_CLASS_HID_3c5d8 = 0x3c5d8,
-	BNXT_ULP_CLASS_HID_23f8c = 0x23f8c,
-	BNXT_ULP_CLASS_HID_2a88c = 0x2a88c,
-	BNXT_ULP_CLASS_HID_3558c = 0x3558c,
-	BNXT_ULP_CLASS_HID_3de8c = 0x3de8c,
-	BNXT_ULP_CLASS_HID_2507c = 0x2507c,
-	BNXT_ULP_CLASS_HID_2dd7c = 0x2dd7c,
-	BNXT_ULP_CLASS_HID_3467c = 0x3467c,
-	BNXT_ULP_CLASS_HID_39430 = 0x39430,
+	BNXT_ULP_CLASS_HID_381bc = 0x381bc,
+	BNXT_ULP_CLASS_HID_3cb94 = 0x3cb94,
+	BNXT_ULP_CLASS_HID_38778 = 0x38778,
+	BNXT_ULP_CLASS_HID_7c54c = 0x7c54c,
+	BNXT_ULP_CLASS_HID_78130 = 0x78130,
+	BNXT_ULP_CLASS_HID_7cb08 = 0x7cb08,
+	BNXT_ULP_CLASS_HID_786ec = 0x786ec,
+	BNXT_ULP_CLASS_HID_7aee8 = 0x7aee8,
+	BNXT_ULP_CLASS_HID_7c618 = 0x7c618,
+	BNXT_ULP_CLASS_HID_7d4a4 = 0x7d4a4,
+	BNXT_ULP_CLASS_HID_79088 = 0x79088,
+	BNXT_ULP_CLASS_HID_78a94 = 0x78a94,
+	BNXT_ULP_CLASS_HID_7a584 = 0x7a584,
+	BNXT_ULP_CLASS_HID_7b050 = 0x7b050,
+	BNXT_ULP_CLASS_HID_7ab40 = 0x7ab40,
+	BNXT_ULP_CLASS_HID_79430 = 0x79430,
+	BNXT_ULP_CLASS_HID_78f20 = 0x78f20,
+	BNXT_ULP_CLASS_HID_79dec = 0x79dec,
+	BNXT_ULP_CLASS_HID_7b51c = 0x7b51c,
+	BNXT_ULP_CLASS_HID_7d09c = 0x7d09c,
+	BNXT_ULP_CLASS_HID_7cb8c = 0x7cb8c,
+	BNXT_ULP_CLASS_HID_7d658 = 0x7d658,
+	BNXT_ULP_CLASS_HID_7923c = 0x7923c,
+	BNXT_ULP_CLASS_HID_7ba38 = 0x7ba38,
+	BNXT_ULP_CLASS_HID_7d528 = 0x7d528,
+	BNXT_ULP_CLASS_HID_7a3f4 = 0x7a3f4,
+	BNXT_ULP_CLASS_HID_7dae4 = 0x7dae4,
+	BNXT_ULP_CLASS_HID_799a4 = 0x799a4,
+	BNXT_ULP_CLASS_HID_7b0d4 = 0x7b0d4,
+	BNXT_ULP_CLASS_HID_79f60 = 0x79f60,
+	BNXT_ULP_CLASS_HID_7b690 = 0x7b690,
+	BNXT_ULP_CLASS_HID_7de8c = 0x7de8c,
+	BNXT_ULP_CLASS_HID_79a70 = 0x79a70,
+	BNXT_ULP_CLASS_HID_7c448 = 0x7c448,
+	BNXT_ULP_CLASS_HID_7802c = 0x7802c,
+	BNXT_ULP_CLASS_HID_86a0 = 0x86a0,
+	BNXT_ULP_CLASS_HID_a1b0 = 0xa1b0,
+	BNXT_ULP_CLASS_HID_8c6c = 0x8c6c,
+	BNXT_ULP_CLASS_HID_a77c = 0xa77c,
+	BNXT_ULP_CLASS_HID_900c = 0x900c,
+	BNXT_ULP_CLASS_HID_8b1c = 0x8b1c,
+	BNXT_ULP_CLASS_HID_99c8 = 0x99c8,
+	BNXT_ULP_CLASS_HID_b0d8 = 0xb0d8,
+	BNXT_ULP_CLASS_HID_aad4 = 0xaad4,
+	BNXT_ULP_CLASS_HID_c224 = 0xc224,
+	BNXT_ULP_CLASS_HID_d090 = 0xd090,
+	BNXT_ULP_CLASS_HID_cbe0 = 0xcbe0,
+	BNXT_ULP_CLASS_HID_b4b0 = 0xb4b0,
+	BNXT_ULP_CLASS_HID_af80 = 0xaf80,
+	BNXT_ULP_CLASS_HID_ba7c = 0xba7c,
+	BNXT_ULP_CLASS_HID_d54c = 0xd54c,
+	BNXT_ULP_CLASS_HID_48374 = 0x48374,
+	BNXT_ULP_CLASS_HID_4ba44 = 0x4ba44,
+	BNXT_ULP_CLASS_HID_48930 = 0x48930,
+	BNXT_ULP_CLASS_HID_4a000 = 0x4a000,
+	BNXT_ULP_CLASS_HID_4c80c = 0x4c80c,
+	BNXT_ULP_CLASS_HID_48420 = 0x48420,
+	BNXT_ULP_CLASS_HID_4929c = 0x4929c,
+	BNXT_ULP_CLASS_HID_48dec = 0x48dec,
+	BNXT_ULP_CLASS_HID_4a798 = 0x4a798,
+	BNXT_ULP_CLASS_HID_4dee8 = 0x4dee8,
+	BNXT_ULP_CLASS_HID_4ada4 = 0x4ada4,
+	BNXT_ULP_CLASS_HID_4c4b4 = 0x4c4b4,
+	BNXT_ULP_CLASS_HID_4b144 = 0x4b144,
+	BNXT_ULP_CLASS_HID_4a854 = 0x4a854,
+	BNXT_ULP_CLASS_HID_4b700 = 0x4b700,
+	BNXT_ULP_CLASS_HID_4ae10 = 0x4ae10,
+	BNXT_ULP_CLASS_HID_1bca0 = 0x1bca0,
+	BNXT_ULP_CLASS_HID_1d7b0 = 0x1d7b0,
+	BNXT_ULP_CLASS_HID_1a26c = 0x1a26c,
+	BNXT_ULP_CLASS_HID_1dd7c = 0x1dd7c,
+	BNXT_ULP_CLASS_HID_1860c = 0x1860c,
+	BNXT_ULP_CLASS_HID_1a11c = 0x1a11c,
+	BNXT_ULP_CLASS_HID_18fc8 = 0x18fc8,
+	BNXT_ULP_CLASS_HID_1a6d8 = 0x1a6d8,
+	BNXT_ULP_CLASS_HID_1c0d4 = 0x1c0d4,
+	BNXT_ULP_CLASS_HID_19ce8 = 0x19ce8,
+	BNXT_ULP_CLASS_HID_1c690 = 0x1c690,
+	BNXT_ULP_CLASS_HID_182b4 = 0x182b4,
+	BNXT_ULP_CLASS_HID_1aab0 = 0x1aab0,
+	BNXT_ULP_CLASS_HID_1c580 = 0x1c580,
+	BNXT_ULP_CLASS_HID_1d07c = 0x1d07c,
+	BNXT_ULP_CLASS_HID_1cb4c = 0x1cb4c,
+	BNXT_ULP_CLASS_HID_5b974 = 0x5b974,
+	BNXT_ULP_CLASS_HID_5d044 = 0x5d044,
+	BNXT_ULP_CLASS_HID_5bf30 = 0x5bf30,
+	BNXT_ULP_CLASS_HID_5d600 = 0x5d600,
+	BNXT_ULP_CLASS_HID_582d0 = 0x582d0,
+	BNXT_ULP_CLASS_HID_5ba20 = 0x5ba20,
+	BNXT_ULP_CLASS_HID_5889c = 0x5889c,
+	BNXT_ULP_CLASS_HID_5a3ec = 0x5a3ec,
+	BNXT_ULP_CLASS_HID_5dd98 = 0x5dd98,
+	BNXT_ULP_CLASS_HID_599bc = 0x599bc,
+	BNXT_ULP_CLASS_HID_5c3a4 = 0x5c3a4,
+	BNXT_ULP_CLASS_HID_59f78 = 0x59f78,
+	BNXT_ULP_CLASS_HID_5a744 = 0x5a744,
+	BNXT_ULP_CLASS_HID_5de54 = 0x5de54,
+	BNXT_ULP_CLASS_HID_5ad00 = 0x5ad00,
+	BNXT_ULP_CLASS_HID_5c410 = 0x5c410,
+	BNXT_ULP_CLASS_HID_cd20 = 0xcd20,
+	BNXT_ULP_CLASS_HID_e430 = 0xe430,
+	BNXT_ULP_CLASS_HID_f2ec = 0xf2ec,
+	BNXT_ULP_CLASS_HID_edfc = 0xedfc,
+	BNXT_ULP_CLASS_HID_d68c = 0xd68c,
+	BNXT_ULP_CLASS_HID_f19c = 0xf19c,
+	BNXT_ULP_CLASS_HID_dc48 = 0xdc48,
+	BNXT_ULP_CLASS_HID_f758 = 0xf758,
+	BNXT_ULP_CLASS_HID_d154 = 0xd154,
+	BNXT_ULP_CLASS_HID_c8a4 = 0xc8a4,
+	BNXT_ULP_CLASS_HID_d710 = 0xd710,
+	BNXT_ULP_CLASS_HID_d334 = 0xd334,
+	BNXT_ULP_CLASS_HID_fb30 = 0xfb30,
+	BNXT_ULP_CLASS_HID_d200 = 0xd200,
+	BNXT_ULP_CLASS_HID_e0fc = 0xe0fc,
+	BNXT_ULP_CLASS_HID_dbcc = 0xdbcc,
+	BNXT_ULP_CLASS_HID_4c9f4 = 0x4c9f4,
+	BNXT_ULP_CLASS_HID_4e0c4 = 0x4e0c4,
+	BNXT_ULP_CLASS_HID_4cfb0 = 0x4cfb0,
+	BNXT_ULP_CLASS_HID_4e680 = 0x4e680,
+	BNXT_ULP_CLASS_HID_4d350 = 0x4d350,
+	BNXT_ULP_CLASS_HID_4caa0 = 0x4caa0,
+	BNXT_ULP_CLASS_HID_4d91c = 0x4d91c,
+	BNXT_ULP_CLASS_HID_4f06c = 0x4f06c,
+	BNXT_ULP_CLASS_HID_4ea18 = 0x4ea18,
+	BNXT_ULP_CLASS_HID_4c568 = 0x4c568,
+	BNXT_ULP_CLASS_HID_4d024 = 0x4d024,
+	BNXT_ULP_CLASS_HID_4cb34 = 0x4cb34,
+	BNXT_ULP_CLASS_HID_4f7c4 = 0x4f7c4,
+	BNXT_ULP_CLASS_HID_4eed4 = 0x4eed4,
+	BNXT_ULP_CLASS_HID_4fd80 = 0x4fd80,
+	BNXT_ULP_CLASS_HID_4d490 = 0x4d490,
+	BNXT_ULP_CLASS_HID_1e320 = 0x1e320,
+	BNXT_ULP_CLASS_HID_1da30 = 0x1da30,
+	BNXT_ULP_CLASS_HID_1e8ec = 0x1e8ec,
+	BNXT_ULP_CLASS_HID_1c3fc = 0x1c3fc,
+	BNXT_ULP_CLASS_HID_1cc8c = 0x1cc8c,
+	BNXT_ULP_CLASS_HID_1e79c = 0x1e79c,
+	BNXT_ULP_CLASS_HID_1f248 = 0x1f248,
+	BNXT_ULP_CLASS_HID_1ed58 = 0x1ed58,
+	BNXT_ULP_CLASS_HID_1c754 = 0x1c754,
+	BNXT_ULP_CLASS_HID_1c368 = 0x1c368,
+	BNXT_ULP_CLASS_HID_1cd10 = 0x1cd10,
+	BNXT_ULP_CLASS_HID_1c934 = 0x1c934,
+	BNXT_ULP_CLASS_HID_1d130 = 0x1d130,
+	BNXT_ULP_CLASS_HID_1c800 = 0x1c800,
+	BNXT_ULP_CLASS_HID_1d6fc = 0x1d6fc,
+	BNXT_ULP_CLASS_HID_1d290 = 0x1d290,
+	BNXT_ULP_CLASS_HID_5fff4 = 0x5fff4,
+	BNXT_ULP_CLASS_HID_5d6c4 = 0x5d6c4,
+	BNXT_ULP_CLASS_HID_5e5b0 = 0x5e5b0,
+	BNXT_ULP_CLASS_HID_5dc80 = 0x5dc80,
+	BNXT_ULP_CLASS_HID_5c950 = 0x5c950,
+	BNXT_ULP_CLASS_HID_5e0a0 = 0x5e0a0,
+	BNXT_ULP_CLASS_HID_5cf1c = 0x5cf1c,
+	BNXT_ULP_CLASS_HID_5e66c = 0x5e66c,
+	BNXT_ULP_CLASS_HID_5c018 = 0x5c018,
+	BNXT_ULP_CLASS_HID_5dc3c = 0x5dc3c,
+	BNXT_ULP_CLASS_HID_5c624 = 0x5c624,
+	BNXT_ULP_CLASS_HID_5c5f8 = 0x5c5f8,
+	BNXT_ULP_CLASS_HID_5edc4 = 0x5edc4,
+	BNXT_ULP_CLASS_HID_5c4d4 = 0x5c4d4,
+	BNXT_ULP_CLASS_HID_5d380 = 0x5d380,
+	BNXT_ULP_CLASS_HID_5ca90 = 0x5ca90,
+	BNXT_ULP_CLASS_HID_abe0 = 0xabe0,
+	BNXT_ULP_CLASS_HID_a2f0 = 0xa2f0,
+	BNXT_ULP_CLASS_HID_b1ac = 0xb1ac,
+	BNXT_ULP_CLASS_HID_a8bc = 0xa8bc,
+	BNXT_ULP_CLASS_HID_b54c = 0xb54c,
+	BNXT_ULP_CLASS_HID_ac5c = 0xac5c,
+	BNXT_ULP_CLASS_HID_bb08 = 0xbb08,
+	BNXT_ULP_CLASS_HID_b218 = 0xb218,
+	BNXT_ULP_CLASS_HID_ac14 = 0xac14,
+	BNXT_ULP_CLASS_HID_e764 = 0xe764,
+	BNXT_ULP_CLASS_HID_f5d0 = 0xf5d0,
+	BNXT_ULP_CLASS_HID_b1f4 = 0xb1f4,
+	BNXT_ULP_CLASS_HID_b9f0 = 0xb9f0,
+	BNXT_ULP_CLASS_HID_f0c0 = 0xf0c0,
+	BNXT_ULP_CLASS_HID_bfbc = 0xbfbc,
+	BNXT_ULP_CLASS_HID_f68c = 0xf68c,
+	BNXT_ULP_CLASS_HID_4a4b4 = 0x4a4b4,
+	BNXT_ULP_CLASS_HID_4bf84 = 0x4bf84,
+	BNXT_ULP_CLASS_HID_4aa70 = 0x4aa70,
+	BNXT_ULP_CLASS_HID_4a540 = 0x4a540,
+	BNXT_ULP_CLASS_HID_4ed4c = 0x4ed4c,
+	BNXT_ULP_CLASS_HID_4a960 = 0x4a960,
+	BNXT_ULP_CLASS_HID_4b7dc = 0x4b7dc,
+	BNXT_ULP_CLASS_HID_4af2c = 0x4af2c,
+	BNXT_ULP_CLASS_HID_4a8d8 = 0x4a8d8,
+	BNXT_ULP_CLASS_HID_4e028 = 0x4e028,
+	BNXT_ULP_CLASS_HID_4aee4 = 0x4aee4,
+	BNXT_ULP_CLASS_HID_4e9f4 = 0x4e9f4,
+	BNXT_ULP_CLASS_HID_4b284 = 0x4b284,
+	BNXT_ULP_CLASS_HID_4ad94 = 0x4ad94,
+	BNXT_ULP_CLASS_HID_4b840 = 0x4b840,
+	BNXT_ULP_CLASS_HID_4f350 = 0x4f350,
+	BNXT_ULP_CLASS_HID_1a1e0 = 0x1a1e0,
+	BNXT_ULP_CLASS_HID_1f8f0 = 0x1f8f0,
+	BNXT_ULP_CLASS_HID_1a7ac = 0x1a7ac,
+	BNXT_ULP_CLASS_HID_1febc = 0x1febc,
+	BNXT_ULP_CLASS_HID_1ab4c = 0x1ab4c,
+	BNXT_ULP_CLASS_HID_1a25c = 0x1a25c,
+	BNXT_ULP_CLASS_HID_1b108 = 0x1b108,
+	BNXT_ULP_CLASS_HID_1a818 = 0x1a818,
+	BNXT_ULP_CLASS_HID_1e214 = 0x1e214,
+	BNXT_ULP_CLASS_HID_1be28 = 0x1be28,
+	BNXT_ULP_CLASS_HID_1ebd0 = 0x1ebd0,
+	BNXT_ULP_CLASS_HID_1a7f4 = 0x1a7f4,
+	BNXT_ULP_CLASS_HID_1aff0 = 0x1aff0,
+	BNXT_ULP_CLASS_HID_1e6c0 = 0x1e6c0,
+	BNXT_ULP_CLASS_HID_1f5bc = 0x1f5bc,
+	BNXT_ULP_CLASS_HID_1b150 = 0x1b150,
+	BNXT_ULP_CLASS_HID_5bab4 = 0x5bab4,
+	BNXT_ULP_CLASS_HID_5f584 = 0x5f584,
+	BNXT_ULP_CLASS_HID_5a070 = 0x5a070,
+	BNXT_ULP_CLASS_HID_5fb40 = 0x5fb40,
+	BNXT_ULP_CLASS_HID_5a410 = 0x5a410,
+	BNXT_ULP_CLASS_HID_5bf60 = 0x5bf60,
+	BNXT_ULP_CLASS_HID_5addc = 0x5addc,
+	BNXT_ULP_CLASS_HID_5a52c = 0x5a52c,
+	BNXT_ULP_CLASS_HID_5fed8 = 0x5fed8,
+	BNXT_ULP_CLASS_HID_5bafc = 0x5bafc,
+	BNXT_ULP_CLASS_HID_5e4e4 = 0x5e4e4,
+	BNXT_ULP_CLASS_HID_5a0b8 = 0x5a0b8,
+	BNXT_ULP_CLASS_HID_5a884 = 0x5a884,
+	BNXT_ULP_CLASS_HID_5e394 = 0x5e394,
+	BNXT_ULP_CLASS_HID_5ae40 = 0x5ae40,
+	BNXT_ULP_CLASS_HID_5e950 = 0x5e950,
+	BNXT_ULP_CLASS_HID_ee60 = 0xee60,
+	BNXT_ULP_CLASS_HID_e970 = 0xe970,
+	BNXT_ULP_CLASS_HID_f42c = 0xf42c,
+	BNXT_ULP_CLASS_HID_ef3c = 0xef3c,
+	BNXT_ULP_CLASS_HID_fbcc = 0xfbcc,
+	BNXT_ULP_CLASS_HID_f2dc = 0xf2dc,
+	BNXT_ULP_CLASS_HID_e188 = 0xe188,
+	BNXT_ULP_CLASS_HID_f898 = 0xf898,
+	BNXT_ULP_CLASS_HID_f294 = 0xf294,
+	BNXT_ULP_CLASS_HID_ede4 = 0xede4,
+	BNXT_ULP_CLASS_HID_f850 = 0xf850,
+	BNXT_ULP_CLASS_HID_f474 = 0xf474,
+	BNXT_ULP_CLASS_HID_fc70 = 0xfc70,
+	BNXT_ULP_CLASS_HID_f740 = 0xf740,
+	BNXT_ULP_CLASS_HID_e23c = 0xe23c,
+	BNXT_ULP_CLASS_HID_fd0c = 0xfd0c,
+	BNXT_ULP_CLASS_HID_4eb34 = 0x4eb34,
+	BNXT_ULP_CLASS_HID_4e204 = 0x4e204,
+	BNXT_ULP_CLASS_HID_4f0f0 = 0x4f0f0,
+	BNXT_ULP_CLASS_HID_4ebc0 = 0x4ebc0,
+	BNXT_ULP_CLASS_HID_4f490 = 0x4f490,
+	BNXT_ULP_CLASS_HID_4efe0 = 0x4efe0,
+	BNXT_ULP_CLASS_HID_4fa5c = 0x4fa5c,
+	BNXT_ULP_CLASS_HID_4f5ac = 0x4f5ac,
+	BNXT_ULP_CLASS_HID_4ef58 = 0x4ef58,
+	BNXT_ULP_CLASS_HID_4e6a8 = 0x4e6a8,
+	BNXT_ULP_CLASS_HID_4f564 = 0x4f564,
+	BNXT_ULP_CLASS_HID_4f138 = 0x4f138,
+	BNXT_ULP_CLASS_HID_4f904 = 0x4f904,
+	BNXT_ULP_CLASS_HID_4f014 = 0x4f014,
+	BNXT_ULP_CLASS_HID_4fec0 = 0x4fec0,
+	BNXT_ULP_CLASS_HID_4f9d0 = 0x4f9d0,
+	BNXT_ULP_CLASS_HID_1e460 = 0x1e460,
+	BNXT_ULP_CLASS_HID_1ff70 = 0x1ff70,
+	BNXT_ULP_CLASS_HID_1ea2c = 0x1ea2c,
+	BNXT_ULP_CLASS_HID_1e53c = 0x1e53c,
+	BNXT_ULP_CLASS_HID_1f1cc = 0x1f1cc,
+	BNXT_ULP_CLASS_HID_1e8dc = 0x1e8dc,
+	BNXT_ULP_CLASS_HID_1f788 = 0x1f788,
+	BNXT_ULP_CLASS_HID_1ee98 = 0x1ee98,
+	BNXT_ULP_CLASS_HID_1e894 = 0x1e894,
+	BNXT_ULP_CLASS_HID_1e4a8 = 0x1e4a8,
+	BNXT_ULP_CLASS_HID_1f364 = 0x1f364,
+	BNXT_ULP_CLASS_HID_1ea74 = 0x1ea74,
+	BNXT_ULP_CLASS_HID_1f270 = 0x1f270,
+	BNXT_ULP_CLASS_HID_1ed40 = 0x1ed40,
+	BNXT_ULP_CLASS_HID_1f83c = 0x1f83c,
+	BNXT_ULP_CLASS_HID_1f7d0 = 0x1f7d0,
+	BNXT_ULP_CLASS_HID_5e134 = 0x5e134,
+	BNXT_ULP_CLASS_HID_5f804 = 0x5f804,
+	BNXT_ULP_CLASS_HID_5e6f0 = 0x5e6f0,
+	BNXT_ULP_CLASS_HID_5e1c0 = 0x5e1c0,
+	BNXT_ULP_CLASS_HID_5ea90 = 0x5ea90,
+	BNXT_ULP_CLASS_HID_5e5e0 = 0x5e5e0,
+	BNXT_ULP_CLASS_HID_5f05c = 0x5f05c,
+	BNXT_ULP_CLASS_HID_5ebac = 0x5ebac,
+	BNXT_ULP_CLASS_HID_5e558 = 0x5e558,
+	BNXT_ULP_CLASS_HID_5e17c = 0x5e17c,
+	BNXT_ULP_CLASS_HID_5eb64 = 0x5eb64,
+	BNXT_ULP_CLASS_HID_5e738 = 0x5e738,
+	BNXT_ULP_CLASS_HID_5ef04 = 0x5ef04,
+	BNXT_ULP_CLASS_HID_5e614 = 0x5e614,
+	BNXT_ULP_CLASS_HID_5f4c0 = 0x5f4c0,
+	BNXT_ULP_CLASS_HID_5f0e4 = 0x5f0e4,
+	BNXT_ULP_CLASS_HID_5802 = 0x5802,
+	BNXT_ULP_CLASS_HID_5e46 = 0x5e46,
+	BNXT_ULP_CLASS_HID_1d76 = 0x1d76,
+	BNXT_ULP_CLASS_HID_02ba = 0x02ba,
+	BNXT_ULP_CLASS_HID_32a2 = 0x32a2,
+	BNXT_ULP_CLASS_HID_38e6 = 0x38e6,
+	BNXT_ULP_CLASS_HID_52ca = 0x52ca,
+	BNXT_ULP_CLASS_HID_580e = 0x580e,
+	BNXT_ULP_CLASS_HID_44996 = 0x44996,
+	BNXT_ULP_CLASS_HID_410e6 = 0x410e6,
+	BNXT_ULP_CLASS_HID_42036 = 0x42036,
+	BNXT_ULP_CLASS_HID_4264a = 0x4264a,
+	BNXT_ULP_CLASS_HID_45ffe = 0x45ffe,
+	BNXT_ULP_CLASS_HID_44532 = 0x44532,
+	BNXT_ULP_CLASS_HID_4399e = 0x4399e,
+	BNXT_ULP_CLASS_HID_43fd2 = 0x43fd2,
+	BNXT_ULP_CLASS_HID_23da0 = 0x23da0,
+	BNXT_ULP_CLASS_HID_2239c = 0x2239c,
+	BNXT_ULP_CLASS_HID_207fc = 0x207fc,
+	BNXT_ULP_CLASS_HID_20d38 = 0x20d38,
+	BNXT_ULP_CLASS_HID_25e34 = 0x25e34,
+	BNXT_ULP_CLASS_HID_24470 = 0x24470,
+	BNXT_ULP_CLASS_HID_22850 = 0x22850,
+	BNXT_ULP_CLASS_HID_2518c = 0x2518c,
+	BNXT_ULP_CLASS_HID_20970 = 0x20970,
+	BNXT_ULP_CLASS_HID_20eac = 0x20eac,
+	BNXT_ULP_CLASS_HID_2128c = 0x2128c,
+	BNXT_ULP_CLASS_HID_218c8 = 0x218c8,
+	BNXT_ULP_CLASS_HID_22dc4 = 0x22dc4,
+	BNXT_ULP_CLASS_HID_25300 = 0x25300,
+	BNXT_ULP_CLASS_HID_23760 = 0x23760,
+	BNXT_ULP_CLASS_HID_23d5c = 0x23d5c,
+	BNXT_ULP_CLASS_HID_63694 = 0x63694,
+	BNXT_ULP_CLASS_HID_63cd0 = 0x63cd0,
+	BNXT_ULP_CLASS_HID_60030 = 0x60030,
+	BNXT_ULP_CLASS_HID_6066c = 0x6066c,
+	BNXT_ULP_CLASS_HID_65b68 = 0x65b68,
+	BNXT_ULP_CLASS_HID_640a4 = 0x640a4,
+	BNXT_ULP_CLASS_HID_62484 = 0x62484,
+	BNXT_ULP_CLASS_HID_62ac0 = 0x62ac0,
+	BNXT_ULP_CLASS_HID_605a4 = 0x605a4,
+	BNXT_ULP_CLASS_HID_60be0 = 0x60be0,
+	BNXT_ULP_CLASS_HID_64a8c = 0x64a8c,
+	BNXT_ULP_CLASS_HID_6153c = 0x6153c,
+	BNXT_ULP_CLASS_HID_62638 = 0x62638,
+	BNXT_ULP_CLASS_HID_62c74 = 0x62c74,
+	BNXT_ULP_CLASS_HID_63054 = 0x63054,
+	BNXT_ULP_CLASS_HID_63990 = 0x63990,
+	BNXT_ULP_CLASS_HID_9a98 = 0x9a98,
+	BNXT_ULP_CLASS_HID_80a4 = 0x80a4,
+	BNXT_ULP_CLASS_HID_c3b0 = 0xc3b0,
+	BNXT_ULP_CLASS_HID_c9fc = 0xc9fc,
+	BNXT_ULP_CLASS_HID_bf0c = 0xbf0c,
+	BNXT_ULP_CLASS_HID_a548 = 0xa548,
+	BNXT_ULP_CLASS_HID_8968 = 0x8968,
+	BNXT_ULP_CLASS_HID_8eb4 = 0x8eb4,
+	BNXT_ULP_CLASS_HID_497ac = 0x497ac,
+	BNXT_ULP_CLASS_HID_49de8 = 0x49de8,
+	BNXT_ULP_CLASS_HID_4dcc4 = 0x4dcc4,
+	BNXT_ULP_CLASS_HID_4c200 = 0x4c200,
+	BNXT_ULP_CLASS_HID_4b850 = 0x4b850,
+	BNXT_ULP_CLASS_HID_4a19c = 0x4a19c,
+	BNXT_ULP_CLASS_HID_485bc = 0x485bc,
+	BNXT_ULP_CLASS_HID_48bf8 = 0x48bf8,
+	BNXT_ULP_CLASS_HID_1b098 = 0x1b098,
+	BNXT_ULP_CLASS_HID_1b6a4 = 0x1b6a4,
+	BNXT_ULP_CLASS_HID_19ac4 = 0x19ac4,
+	BNXT_ULP_CLASS_HID_18000 = 0x18000,
+	BNXT_ULP_CLASS_HID_1d50c = 0x1d50c,
+	BNXT_ULP_CLASS_HID_1db48 = 0x1db48,
+	BNXT_ULP_CLASS_HID_1bf68 = 0x1bf68,
+	BNXT_ULP_CLASS_HID_1a4b4 = 0x1a4b4,
+	BNXT_ULP_CLASS_HID_58dac = 0x58dac,
+	BNXT_ULP_CLASS_HID_5b3e8 = 0x5b3e8,
+	BNXT_ULP_CLASS_HID_59708 = 0x59708,
+	BNXT_ULP_CLASS_HID_59d54 = 0x59d54,
+	BNXT_ULP_CLASS_HID_5ae50 = 0x5ae50,
+	BNXT_ULP_CLASS_HID_5d79c = 0x5d79c,
+	BNXT_ULP_CLASS_HID_5bbbc = 0x5bbbc,
+	BNXT_ULP_CLASS_HID_5a1f8 = 0x5a1f8,
+	BNXT_ULP_CLASS_HID_5822 = 0x5822,
+	BNXT_ULP_CLASS_HID_5e66 = 0x5e66,
+	BNXT_ULP_CLASS_HID_1d56 = 0x1d56,
+	BNXT_ULP_CLASS_HID_029a = 0x029a,
+	BNXT_ULP_CLASS_HID_3282 = 0x3282,
+	BNXT_ULP_CLASS_HID_38c6 = 0x38c6,
+	BNXT_ULP_CLASS_HID_52ea = 0x52ea,
+	BNXT_ULP_CLASS_HID_582e = 0x582e,
+	BNXT_ULP_CLASS_HID_51ba = 0x51ba,
+	BNXT_ULP_CLASS_HID_57fe = 0x57fe,
+	BNXT_ULP_CLASS_HID_12ee = 0x12ee,
+	BNXT_ULP_CLASS_HID_1832 = 0x1832,
+	BNXT_ULP_CLASS_HID_081a = 0x081a,
+	BNXT_ULP_CLASS_HID_0e5e = 0x0e5e,
+	BNXT_ULP_CLASS_HID_2802 = 0x2802,
+	BNXT_ULP_CLASS_HID_2e46 = 0x2e46,
+	BNXT_ULP_CLASS_HID_4556e = 0x4556e,
+	BNXT_ULP_CLASS_HID_45ab2 = 0x45ab2,
+	BNXT_ULP_CLASS_HID_419a2 = 0x419a2,
+	BNXT_ULP_CLASS_HID_41fe6 = 0x41fe6,
+	BNXT_ULP_CLASS_HID_40fce = 0x40fce,
+	BNXT_ULP_CLASS_HID_43512 = 0x43512,
+	BNXT_ULP_CLASS_HID_42f36 = 0x42f36,
+	BNXT_ULP_CLASS_HID_4557a = 0x4557a,
+	BNXT_ULP_CLASS_HID_42a86 = 0x42a86,
+	BNXT_ULP_CLASS_HID_450ca = 0x450ca,
+	BNXT_ULP_CLASS_HID_44aee = 0x44aee,
+	BNXT_ULP_CLASS_HID_4157e = 0x4157e,
+	BNXT_ULP_CLASS_HID_40566 = 0x40566,
+	BNXT_ULP_CLASS_HID_40aaa = 0x40aaa,
+	BNXT_ULP_CLASS_HID_4254e = 0x4254e,
+	BNXT_ULP_CLASS_HID_42a92 = 0x42a92,
+	BNXT_ULP_CLASS_HID_449b6 = 0x449b6,
+	BNXT_ULP_CLASS_HID_410c6 = 0x410c6,
+	BNXT_ULP_CLASS_HID_42016 = 0x42016,
+	BNXT_ULP_CLASS_HID_4266a = 0x4266a,
+	BNXT_ULP_CLASS_HID_45fde = 0x45fde,
+	BNXT_ULP_CLASS_HID_44512 = 0x44512,
+	BNXT_ULP_CLASS_HID_439be = 0x439be,
+	BNXT_ULP_CLASS_HID_43ff2 = 0x43ff2,
+	BNXT_ULP_CLASS_HID_63682 = 0x63682,
+	BNXT_ULP_CLASS_HID_63cc6 = 0x63cc6,
+	BNXT_ULP_CLASS_HID_61162 = 0x61162,
+	BNXT_ULP_CLASS_HID_616a6 = 0x616a6,
+	BNXT_ULP_CLASS_HID_60c2a = 0x60c2a,
+	BNXT_ULP_CLASS_HID_6326e = 0x6326e,
+	BNXT_ULP_CLASS_HID_645be = 0x645be,
+	BNXT_ULP_CLASS_HID_64bf2 = 0x64bf2,
+	BNXT_ULP_CLASS_HID_50082 = 0x50082,
+	BNXT_ULP_CLASS_HID_506c6 = 0x506c6,
+	BNXT_ULP_CLASS_HID_55616 = 0x55616,
+	BNXT_ULP_CLASS_HID_55c6a = 0x55c6a,
+	BNXT_ULP_CLASS_HID_5162a = 0x5162a,
+	BNXT_ULP_CLASS_HID_51c6e = 0x51c6e,
+	BNXT_ULP_CLASS_HID_52fbe = 0x52fbe,
+	BNXT_ULP_CLASS_HID_555f2 = 0x555f2,
+	BNXT_ULP_CLASS_HID_72c82 = 0x72c82,
+	BNXT_ULP_CLASS_HID_752c6 = 0x752c6,
+	BNXT_ULP_CLASS_HID_70762 = 0x70762,
+	BNXT_ULP_CLASS_HID_70ca6 = 0x70ca6,
+	BNXT_ULP_CLASS_HID_7222a = 0x7222a,
+	BNXT_ULP_CLASS_HID_7286e = 0x7286e,
+	BNXT_ULP_CLASS_HID_71c8a = 0x71c8a,
+	BNXT_ULP_CLASS_HID_702ce = 0x702ce,
+	BNXT_ULP_CLASS_HID_5842 = 0x5842,
+	BNXT_ULP_CLASS_HID_5e06 = 0x5e06,
+	BNXT_ULP_CLASS_HID_1d36 = 0x1d36,
+	BNXT_ULP_CLASS_HID_02fa = 0x02fa,
+	BNXT_ULP_CLASS_HID_32e2 = 0x32e2,
+	BNXT_ULP_CLASS_HID_38a6 = 0x38a6,
+	BNXT_ULP_CLASS_HID_528a = 0x528a,
+	BNXT_ULP_CLASS_HID_584e = 0x584e,
+	BNXT_ULP_CLASS_HID_51da = 0x51da,
+	BNXT_ULP_CLASS_HID_579e = 0x579e,
+	BNXT_ULP_CLASS_HID_128e = 0x128e,
+	BNXT_ULP_CLASS_HID_1852 = 0x1852,
+	BNXT_ULP_CLASS_HID_087a = 0x087a,
+	BNXT_ULP_CLASS_HID_0e3e = 0x0e3e,
+	BNXT_ULP_CLASS_HID_2862 = 0x2862,
+	BNXT_ULP_CLASS_HID_2e26 = 0x2e26,
+	BNXT_ULP_CLASS_HID_4550e = 0x4550e,
+	BNXT_ULP_CLASS_HID_45ad2 = 0x45ad2,
+	BNXT_ULP_CLASS_HID_419c2 = 0x419c2,
+	BNXT_ULP_CLASS_HID_41f86 = 0x41f86,
+	BNXT_ULP_CLASS_HID_40fae = 0x40fae,
+	BNXT_ULP_CLASS_HID_43572 = 0x43572,
+	BNXT_ULP_CLASS_HID_42f56 = 0x42f56,
+	BNXT_ULP_CLASS_HID_4551a = 0x4551a,
+	BNXT_ULP_CLASS_HID_42ae6 = 0x42ae6,
+	BNXT_ULP_CLASS_HID_450aa = 0x450aa,
+	BNXT_ULP_CLASS_HID_44a8e = 0x44a8e,
+	BNXT_ULP_CLASS_HID_4151e = 0x4151e,
+	BNXT_ULP_CLASS_HID_40506 = 0x40506,
+	BNXT_ULP_CLASS_HID_40aca = 0x40aca,
+	BNXT_ULP_CLASS_HID_4252e = 0x4252e,
+	BNXT_ULP_CLASS_HID_42af2 = 0x42af2,
+	BNXT_ULP_CLASS_HID_449d6 = 0x449d6,
+	BNXT_ULP_CLASS_HID_410a6 = 0x410a6,
+	BNXT_ULP_CLASS_HID_42076 = 0x42076,
+	BNXT_ULP_CLASS_HID_4260a = 0x4260a,
+	BNXT_ULP_CLASS_HID_45fbe = 0x45fbe,
+	BNXT_ULP_CLASS_HID_44572 = 0x44572,
+	BNXT_ULP_CLASS_HID_439de = 0x439de,
+	BNXT_ULP_CLASS_HID_43f92 = 0x43f92,
+	BNXT_ULP_CLASS_HID_636e2 = 0x636e2,
+	BNXT_ULP_CLASS_HID_63ca6 = 0x63ca6,
+	BNXT_ULP_CLASS_HID_61102 = 0x61102,
+	BNXT_ULP_CLASS_HID_616c6 = 0x616c6,
+	BNXT_ULP_CLASS_HID_60c4a = 0x60c4a,
+	BNXT_ULP_CLASS_HID_6320e = 0x6320e,
+	BNXT_ULP_CLASS_HID_645de = 0x645de,
+	BNXT_ULP_CLASS_HID_64b92 = 0x64b92,
+	BNXT_ULP_CLASS_HID_500e2 = 0x500e2,
+	BNXT_ULP_CLASS_HID_506a6 = 0x506a6,
+	BNXT_ULP_CLASS_HID_55676 = 0x55676,
+	BNXT_ULP_CLASS_HID_55c0a = 0x55c0a,
+	BNXT_ULP_CLASS_HID_5164a = 0x5164a,
+	BNXT_ULP_CLASS_HID_51c0e = 0x51c0e,
+	BNXT_ULP_CLASS_HID_52fde = 0x52fde,
+	BNXT_ULP_CLASS_HID_55592 = 0x55592,
+	BNXT_ULP_CLASS_HID_72ce2 = 0x72ce2,
+	BNXT_ULP_CLASS_HID_752a6 = 0x752a6,
+	BNXT_ULP_CLASS_HID_70702 = 0x70702,
+	BNXT_ULP_CLASS_HID_70cc6 = 0x70cc6,
+	BNXT_ULP_CLASS_HID_7224a = 0x7224a,
+	BNXT_ULP_CLASS_HID_7280e = 0x7280e,
+	BNXT_ULP_CLASS_HID_71cea = 0x71cea,
+	BNXT_ULP_CLASS_HID_702ae = 0x702ae,
+	BNXT_ULP_CLASS_HID_23dc0 = 0x23dc0,
+	BNXT_ULP_CLASS_HID_223fc = 0x223fc,
+	BNXT_ULP_CLASS_HID_2079c = 0x2079c,
+	BNXT_ULP_CLASS_HID_20d58 = 0x20d58,
+	BNXT_ULP_CLASS_HID_25e54 = 0x25e54,
+	BNXT_ULP_CLASS_HID_24410 = 0x24410,
+	BNXT_ULP_CLASS_HID_22830 = 0x22830,
+	BNXT_ULP_CLASS_HID_251ec = 0x251ec,
+	BNXT_ULP_CLASS_HID_20910 = 0x20910,
+	BNXT_ULP_CLASS_HID_20ecc = 0x20ecc,
+	BNXT_ULP_CLASS_HID_212ec = 0x212ec,
+	BNXT_ULP_CLASS_HID_218a8 = 0x218a8,
+	BNXT_ULP_CLASS_HID_22da4 = 0x22da4,
+	BNXT_ULP_CLASS_HID_25360 = 0x25360,
+	BNXT_ULP_CLASS_HID_23700 = 0x23700,
+	BNXT_ULP_CLASS_HID_23d3c = 0x23d3c,
+	BNXT_ULP_CLASS_HID_636f4 = 0x636f4,
+	BNXT_ULP_CLASS_HID_63cb0 = 0x63cb0,
+	BNXT_ULP_CLASS_HID_60050 = 0x60050,
+	BNXT_ULP_CLASS_HID_6060c = 0x6060c,
+	BNXT_ULP_CLASS_HID_65b08 = 0x65b08,
+	BNXT_ULP_CLASS_HID_640c4 = 0x640c4,
+	BNXT_ULP_CLASS_HID_624e4 = 0x624e4,
+	BNXT_ULP_CLASS_HID_62aa0 = 0x62aa0,
+	BNXT_ULP_CLASS_HID_605c4 = 0x605c4,
+	BNXT_ULP_CLASS_HID_60b80 = 0x60b80,
+	BNXT_ULP_CLASS_HID_64aec = 0x64aec,
+	BNXT_ULP_CLASS_HID_6155c = 0x6155c,
+	BNXT_ULP_CLASS_HID_62658 = 0x62658,
+	BNXT_ULP_CLASS_HID_62c14 = 0x62c14,
+	BNXT_ULP_CLASS_HID_63034 = 0x63034,
+	BNXT_ULP_CLASS_HID_639f0 = 0x639f0,
+	BNXT_ULP_CLASS_HID_353c0 = 0x353c0,
+	BNXT_ULP_CLASS_HID_359fc = 0x359fc,
+	BNXT_ULP_CLASS_HID_33d9c = 0x33d9c,
+	BNXT_ULP_CLASS_HID_32358 = 0x32358,
+	BNXT_ULP_CLASS_HID_31908 = 0x31908,
+	BNXT_ULP_CLASS_HID_31ec4 = 0x31ec4,
+	BNXT_ULP_CLASS_HID_35e30 = 0x35e30,
+	BNXT_ULP_CLASS_HID_347ec = 0x347ec,
+	BNXT_ULP_CLASS_HID_33f10 = 0x33f10,
+	BNXT_ULP_CLASS_HID_324cc = 0x324cc,
+	BNXT_ULP_CLASS_HID_308ec = 0x308ec,
+	BNXT_ULP_CLASS_HID_30ea8 = 0x30ea8,
+	BNXT_ULP_CLASS_HID_343a4 = 0x343a4,
+	BNXT_ULP_CLASS_HID_34960 = 0x34960,
+	BNXT_ULP_CLASS_HID_32d00 = 0x32d00,
+	BNXT_ULP_CLASS_HID_3533c = 0x3533c,
+	BNXT_ULP_CLASS_HID_72cf4 = 0x72cf4,
+	BNXT_ULP_CLASS_HID_752b0 = 0x752b0,
+	BNXT_ULP_CLASS_HID_73650 = 0x73650,
+	BNXT_ULP_CLASS_HID_73c0c = 0x73c0c,
+	BNXT_ULP_CLASS_HID_7123c = 0x7123c,
+	BNXT_ULP_CLASS_HID_71bf8 = 0x71bf8,
+	BNXT_ULP_CLASS_HID_75ae4 = 0x75ae4,
+	BNXT_ULP_CLASS_HID_740a0 = 0x740a0,
+	BNXT_ULP_CLASS_HID_73bc4 = 0x73bc4,
+	BNXT_ULP_CLASS_HID_72180 = 0x72180,
+	BNXT_ULP_CLASS_HID_705a0 = 0x705a0,
+	BNXT_ULP_CLASS_HID_70b5c = 0x70b5c,
+	BNXT_ULP_CLASS_HID_75c58 = 0x75c58,
+	BNXT_ULP_CLASS_HID_74214 = 0x74214,
+	BNXT_ULP_CLASS_HID_72634 = 0x72634,
+	BNXT_ULP_CLASS_HID_72ff0 = 0x72ff0,
+	BNXT_ULP_CLASS_HID_2a6c0 = 0x2a6c0,
+	BNXT_ULP_CLASS_HID_2acfc = 0x2acfc,
+	BNXT_ULP_CLASS_HID_2b09c = 0x2b09c,
+	BNXT_ULP_CLASS_HID_2b658 = 0x2b658,
+	BNXT_ULP_CLASS_HID_2cb54 = 0x2cb54,
+	BNXT_ULP_CLASS_HID_295c4 = 0x295c4,
+	BNXT_ULP_CLASS_HID_2d530 = 0x2d530,
+	BNXT_ULP_CLASS_HID_2daec = 0x2daec,
+	BNXT_ULP_CLASS_HID_2b210 = 0x2b210,
+	BNXT_ULP_CLASS_HID_2bbcc = 0x2bbcc,
+	BNXT_ULP_CLASS_HID_29fec = 0x29fec,
+	BNXT_ULP_CLASS_HID_285a8 = 0x285a8,
+	BNXT_ULP_CLASS_HID_2d6a4 = 0x2d6a4,
+	BNXT_ULP_CLASS_HID_2dc60 = 0x2dc60,
+	BNXT_ULP_CLASS_HID_2a000 = 0x2a000,
+	BNXT_ULP_CLASS_HID_2a63c = 0x2a63c,
+	BNXT_ULP_CLASS_HID_6a3f4 = 0x6a3f4,
+	BNXT_ULP_CLASS_HID_6a9b0 = 0x6a9b0,
+	BNXT_ULP_CLASS_HID_68d50 = 0x68d50,
+	BNXT_ULP_CLASS_HID_6b30c = 0x6b30c,
+	BNXT_ULP_CLASS_HID_6c408 = 0x6c408,
+	BNXT_ULP_CLASS_HID_6cdc4 = 0x6cdc4,
+	BNXT_ULP_CLASS_HID_6d1e4 = 0x6d1e4,
+	BNXT_ULP_CLASS_HID_6d7a0 = 0x6d7a0,
+	BNXT_ULP_CLASS_HID_68ec4 = 0x68ec4,
+	BNXT_ULP_CLASS_HID_6b480 = 0x6b480,
+	BNXT_ULP_CLASS_HID_698a0 = 0x698a0,
+	BNXT_ULP_CLASS_HID_69e5c = 0x69e5c,
+	BNXT_ULP_CLASS_HID_6d358 = 0x6d358,
+	BNXT_ULP_CLASS_HID_6d914 = 0x6d914,
+	BNXT_ULP_CLASS_HID_6bd34 = 0x6bd34,
+	BNXT_ULP_CLASS_HID_6a2f0 = 0x6a2f0,
+	BNXT_ULP_CLASS_HID_3dcc0 = 0x3dcc0,
+	BNXT_ULP_CLASS_HID_3c2fc = 0x3c2fc,
+	BNXT_ULP_CLASS_HID_3a69c = 0x3a69c,
+	BNXT_ULP_CLASS_HID_3ac58 = 0x3ac58,
+	BNXT_ULP_CLASS_HID_38208 = 0x38208,
+	BNXT_ULP_CLASS_HID_38bc4 = 0x38bc4,
+	BNXT_ULP_CLASS_HID_3cb30 = 0x3cb30,
+	BNXT_ULP_CLASS_HID_395a0 = 0x395a0,
+	BNXT_ULP_CLASS_HID_3a810 = 0x3a810,
+	BNXT_ULP_CLASS_HID_3d1cc = 0x3d1cc,
+	BNXT_ULP_CLASS_HID_3b5ec = 0x3b5ec,
+	BNXT_ULP_CLASS_HID_3bba8 = 0x3bba8,
+	BNXT_ULP_CLASS_HID_39158 = 0x39158,
+	BNXT_ULP_CLASS_HID_39714 = 0x39714,
+	BNXT_ULP_CLASS_HID_3d600 = 0x3d600,
+	BNXT_ULP_CLASS_HID_3dc3c = 0x3dc3c,
+	BNXT_ULP_CLASS_HID_7d9f4 = 0x7d9f4,
+	BNXT_ULP_CLASS_HID_7dfb0 = 0x7dfb0,
+	BNXT_ULP_CLASS_HID_7a350 = 0x7a350,
+	BNXT_ULP_CLASS_HID_7a90c = 0x7a90c,
+	BNXT_ULP_CLASS_HID_79f3c = 0x79f3c,
+	BNXT_ULP_CLASS_HID_784f8 = 0x784f8,
+	BNXT_ULP_CLASS_HID_7c7e4 = 0x7c7e4,
+	BNXT_ULP_CLASS_HID_7cda0 = 0x7cda0,
+	BNXT_ULP_CLASS_HID_7a4c4 = 0x7a4c4,
+	BNXT_ULP_CLASS_HID_7aa80 = 0x7aa80,
+	BNXT_ULP_CLASS_HID_78ea0 = 0x78ea0,
+	BNXT_ULP_CLASS_HID_7b45c = 0x7b45c,
+	BNXT_ULP_CLASS_HID_7c958 = 0x7c958,
+	BNXT_ULP_CLASS_HID_793c8 = 0x793c8,
+	BNXT_ULP_CLASS_HID_7d334 = 0x7d334,
+	BNXT_ULP_CLASS_HID_7d8f0 = 0x7d8f0,
+	BNXT_ULP_CLASS_HID_9ab8 = 0x9ab8,
+	BNXT_ULP_CLASS_HID_8084 = 0x8084,
+	BNXT_ULP_CLASS_HID_c390 = 0xc390,
+	BNXT_ULP_CLASS_HID_c9dc = 0xc9dc,
+	BNXT_ULP_CLASS_HID_bf2c = 0xbf2c,
+	BNXT_ULP_CLASS_HID_a568 = 0xa568,
+	BNXT_ULP_CLASS_HID_8948 = 0x8948,
+	BNXT_ULP_CLASS_HID_8e94 = 0x8e94,
+	BNXT_ULP_CLASS_HID_4978c = 0x4978c,
+	BNXT_ULP_CLASS_HID_49dc8 = 0x49dc8,
+	BNXT_ULP_CLASS_HID_4dce4 = 0x4dce4,
+	BNXT_ULP_CLASS_HID_4c220 = 0x4c220,
+	BNXT_ULP_CLASS_HID_4b870 = 0x4b870,
+	BNXT_ULP_CLASS_HID_4a1bc = 0x4a1bc,
+	BNXT_ULP_CLASS_HID_4859c = 0x4859c,
+	BNXT_ULP_CLASS_HID_48bd8 = 0x48bd8,
+	BNXT_ULP_CLASS_HID_1b0b8 = 0x1b0b8,
+	BNXT_ULP_CLASS_HID_1b684 = 0x1b684,
+	BNXT_ULP_CLASS_HID_19ae4 = 0x19ae4,
+	BNXT_ULP_CLASS_HID_18020 = 0x18020,
+	BNXT_ULP_CLASS_HID_1d52c = 0x1d52c,
+	BNXT_ULP_CLASS_HID_1db68 = 0x1db68,
+	BNXT_ULP_CLASS_HID_1bf48 = 0x1bf48,
+	BNXT_ULP_CLASS_HID_1a494 = 0x1a494,
+	BNXT_ULP_CLASS_HID_58d8c = 0x58d8c,
+	BNXT_ULP_CLASS_HID_5b3c8 = 0x5b3c8,
+	BNXT_ULP_CLASS_HID_59728 = 0x59728,
+	BNXT_ULP_CLASS_HID_59d74 = 0x59d74,
+	BNXT_ULP_CLASS_HID_5ae70 = 0x5ae70,
+	BNXT_ULP_CLASS_HID_5d7bc = 0x5d7bc,
+	BNXT_ULP_CLASS_HID_5bb9c = 0x5bb9c,
+	BNXT_ULP_CLASS_HID_5a1d8 = 0x5a1d8,
+	BNXT_ULP_CLASS_HID_c138 = 0xc138,
+	BNXT_ULP_CLASS_HID_c704 = 0xc704,
+	BNXT_ULP_CLASS_HID_c610 = 0xc610,
+	BNXT_ULP_CLASS_HID_d0a0 = 0xd0a0,
+	BNXT_ULP_CLASS_HID_e5ac = 0xe5ac,
+	BNXT_ULP_CLASS_HID_ebe8 = 0xebe8,
+	BNXT_ULP_CLASS_HID_cfc8 = 0xcfc8,
+	BNXT_ULP_CLASS_HID_f514 = 0xf514,
+	BNXT_ULP_CLASS_HID_4da0c = 0x4da0c,
+	BNXT_ULP_CLASS_HID_4c048 = 0x4c048,
+	BNXT_ULP_CLASS_HID_4c364 = 0x4c364,
+	BNXT_ULP_CLASS_HID_4c8a0 = 0x4c8a0,
+	BNXT_ULP_CLASS_HID_4fef0 = 0x4fef0,
+	BNXT_ULP_CLASS_HID_4e43c = 0x4e43c,
+	BNXT_ULP_CLASS_HID_4c81c = 0x4c81c,
+	BNXT_ULP_CLASS_HID_4ce58 = 0x4ce58,
+	BNXT_ULP_CLASS_HID_1f738 = 0x1f738,
+	BNXT_ULP_CLASS_HID_1fd04 = 0x1fd04,
+	BNXT_ULP_CLASS_HID_1c164 = 0x1c164,
+	BNXT_ULP_CLASS_HID_1c6a0 = 0x1c6a0,
+	BNXT_ULP_CLASS_HID_1dbac = 0x1dbac,
+	BNXT_ULP_CLASS_HID_1c1e8 = 0x1c1e8,
+	BNXT_ULP_CLASS_HID_1e5c8 = 0x1e5c8,
+	BNXT_ULP_CLASS_HID_1eb14 = 0x1eb14,
+	BNXT_ULP_CLASS_HID_5f00c = 0x5f00c,
+	BNXT_ULP_CLASS_HID_5f648 = 0x5f648,
+	BNXT_ULP_CLASS_HID_5dda8 = 0x5dda8,
+	BNXT_ULP_CLASS_HID_5c3f4 = 0x5c3f4,
+	BNXT_ULP_CLASS_HID_5d4f0 = 0x5d4f0,
+	BNXT_ULP_CLASS_HID_5da3c = 0x5da3c,
+	BNXT_ULP_CLASS_HID_5fe1c = 0x5fe1c,
+	BNXT_ULP_CLASS_HID_5e458 = 0x5e458,
+	BNXT_ULP_CLASS_HID_bc78 = 0xbc78,
+	BNXT_ULP_CLASS_HID_a244 = 0xa244,
+	BNXT_ULP_CLASS_HID_e550 = 0xe550,
+	BNXT_ULP_CLASS_HID_ea9c = 0xea9c,
+	BNXT_ULP_CLASS_HID_a0ec = 0xa0ec,
+	BNXT_ULP_CLASS_HID_a628 = 0xa628,
+	BNXT_ULP_CLASS_HID_aa08 = 0xaa08,
+	BNXT_ULP_CLASS_HID_b054 = 0xb054,
+	BNXT_ULP_CLASS_HID_4b94c = 0x4b94c,
+	BNXT_ULP_CLASS_HID_4be88 = 0x4be88,
+	BNXT_ULP_CLASS_HID_4e1a4 = 0x4e1a4,
+	BNXT_ULP_CLASS_HID_4e7e0 = 0x4e7e0,
+	BNXT_ULP_CLASS_HID_4bd30 = 0x4bd30,
+	BNXT_ULP_CLASS_HID_4a37c = 0x4a37c,
+	BNXT_ULP_CLASS_HID_4a75c = 0x4a75c,
+	BNXT_ULP_CLASS_HID_4ac98 = 0x4ac98,
+	BNXT_ULP_CLASS_HID_1b278 = 0x1b278,
+	BNXT_ULP_CLASS_HID_1b844 = 0x1b844,
+	BNXT_ULP_CLASS_HID_1bfa4 = 0x1bfa4,
+	BNXT_ULP_CLASS_HID_1a5e0 = 0x1a5e0,
+	BNXT_ULP_CLASS_HID_1f6ec = 0x1f6ec,
+	BNXT_ULP_CLASS_HID_1fc28 = 0x1fc28,
+	BNXT_ULP_CLASS_HID_1a008 = 0x1a008,
+	BNXT_ULP_CLASS_HID_1a654 = 0x1a654,
+	BNXT_ULP_CLASS_HID_5af4c = 0x5af4c,
+	BNXT_ULP_CLASS_HID_5b488 = 0x5b488,
+	BNXT_ULP_CLASS_HID_5b8e8 = 0x5b8e8,
+	BNXT_ULP_CLASS_HID_5be34 = 0x5be34,
+	BNXT_ULP_CLASS_HID_5f330 = 0x5f330,
+	BNXT_ULP_CLASS_HID_5f97c = 0x5f97c,
+	BNXT_ULP_CLASS_HID_5bd5c = 0x5bd5c,
+	BNXT_ULP_CLASS_HID_5a298 = 0x5a298,
+	BNXT_ULP_CLASS_HID_e2f8 = 0xe2f8,
+	BNXT_ULP_CLASS_HID_e8c4 = 0xe8c4,
+	BNXT_ULP_CLASS_HID_ebd0 = 0xebd0,
+	BNXT_ULP_CLASS_HID_f260 = 0xf260,
+	BNXT_ULP_CLASS_HID_e76c = 0xe76c,
+	BNXT_ULP_CLASS_HID_eca8 = 0xeca8,
+	BNXT_ULP_CLASS_HID_f088 = 0xf088,
+	BNXT_ULP_CLASS_HID_f6d4 = 0xf6d4,
+	BNXT_ULP_CLASS_HID_4ffcc = 0x4ffcc,
+	BNXT_ULP_CLASS_HID_4e508 = 0x4e508,
+	BNXT_ULP_CLASS_HID_4e424 = 0x4e424,
+	BNXT_ULP_CLASS_HID_4ea60 = 0x4ea60,
+	BNXT_ULP_CLASS_HID_4e3b0 = 0x4e3b0,
+	BNXT_ULP_CLASS_HID_4e9fc = 0x4e9fc,
+	BNXT_ULP_CLASS_HID_4eddc = 0x4eddc,
+	BNXT_ULP_CLASS_HID_4f318 = 0x4f318,
+	BNXT_ULP_CLASS_HID_1f8f8 = 0x1f8f8,
+	BNXT_ULP_CLASS_HID_1fec4 = 0x1fec4,
+	BNXT_ULP_CLASS_HID_1e224 = 0x1e224,
+	BNXT_ULP_CLASS_HID_1e860 = 0x1e860,
+	BNXT_ULP_CLASS_HID_1fd6c = 0x1fd6c,
+	BNXT_ULP_CLASS_HID_1e2a8 = 0x1e2a8,
+	BNXT_ULP_CLASS_HID_1e688 = 0x1e688,
+	BNXT_ULP_CLASS_HID_1ecd4 = 0x1ecd4,
+	BNXT_ULP_CLASS_HID_5f5cc = 0x5f5cc,
+	BNXT_ULP_CLASS_HID_5fb08 = 0x5fb08,
+	BNXT_ULP_CLASS_HID_5ff68 = 0x5ff68,
+	BNXT_ULP_CLASS_HID_5e4b4 = 0x5e4b4,
+	BNXT_ULP_CLASS_HID_5f9b0 = 0x5f9b0,
+	BNXT_ULP_CLASS_HID_5fffc = 0x5fffc,
+	BNXT_ULP_CLASS_HID_5e3dc = 0x5e3dc,
+	BNXT_ULP_CLASS_HID_5e918 = 0x5e918,
+	BNXT_ULP_CLASS_HID_23de0 = 0x23de0,
 	BNXT_ULP_CLASS_HID_223dc = 0x223dc,
-	BNXT_ULP_CLASS_HID_2acdc = 0x2acdc,
-	BNXT_ULP_CLASS_HID_359dc = 0x359dc,
-	BNXT_ULP_CLASS_HID_3c2dc = 0x3c2dc,
-	BNXT_ULP_CLASS_HID_20eec = 0x20eec,
-	BNXT_ULP_CLASS_HID_2bbec = 0x2bbec,
-	BNXT_ULP_CLASS_HID_324ec = 0x324ec,
-	BNXT_ULP_CLASS_HID_3d1ec = 0x3d1ec,
-	BNXT_ULP_CLASS_HID_20ba0 = 0x20ba0,
-	BNXT_ULP_CLASS_HID_2b4a0 = 0x2b4a0,
-	BNXT_ULP_CLASS_HID_321a0 = 0x321a0,
-	BNXT_ULP_CLASS_HID_3aaa0 = 0x3aaa0,
-	BNXT_ULP_CLASS_HID_23c90 = 0x23c90,
-	BNXT_ULP_CLASS_HID_2a990 = 0x2a990,
-	BNXT_ULP_CLASS_HID_35290 = 0x35290,
-	BNXT_ULP_CLASS_HID_3df90 = 0x3df90,
+	BNXT_ULP_CLASS_HID_207bc = 0x207bc,
+	BNXT_ULP_CLASS_HID_20d78 = 0x20d78,
+	BNXT_ULP_CLASS_HID_25e74 = 0x25e74,
 	BNXT_ULP_CLASS_HID_24430 = 0x24430,
-	BNXT_ULP_CLASS_HID_295e4 = 0x295e4,
-	BNXT_ULP_CLASS_HID_31ee4 = 0x31ee4,
-	BNXT_ULP_CLASS_HID_38be4 = 0x38be4,
+	BNXT_ULP_CLASS_HID_22810 = 0x22810,
+	BNXT_ULP_CLASS_HID_251cc = 0x251cc,
+	BNXT_ULP_CLASS_HID_20930 = 0x20930,
+	BNXT_ULP_CLASS_HID_20eec = 0x20eec,
+	BNXT_ULP_CLASS_HID_212cc = 0x212cc,
+	BNXT_ULP_CLASS_HID_21888 = 0x21888,
+	BNXT_ULP_CLASS_HID_22d84 = 0x22d84,
 	BNXT_ULP_CLASS_HID_25340 = 0x25340,
-	BNXT_ULP_CLASS_HID_2dc40 = 0x2dc40,
-	BNXT_ULP_CLASS_HID_34940 = 0x34940,
-	BNXT_ULP_CLASS_HID_39734 = 0x39734,
-	BNXT_ULP_CLASS_HID_22c34 = 0x22c34,
-	BNXT_ULP_CLASS_HID_2d934 = 0x2d934,
-	BNXT_ULP_CLASS_HID_34234 = 0x34234,
-	BNXT_ULP_CLASS_HID_393e8 = 0x393e8,
-	BNXT_ULP_CLASS_HID_240e4 = 0x240e4,
-	BNXT_ULP_CLASS_HID_2cde4 = 0x2cde4,
-	BNXT_ULP_CLASS_HID_31bd8 = 0x31bd8,
-	BNXT_ULP_CLASS_HID_384d8 = 0x384d8,
-	BNXT_ULP_CLASS_HID_23de0 = 0x23de0,
-	BNXT_ULP_CLASS_HID_2a6e0 = 0x2a6e0,
+	BNXT_ULP_CLASS_HID_23720 = 0x23720,
+	BNXT_ULP_CLASS_HID_23d1c = 0x23d1c,
+	BNXT_ULP_CLASS_HID_636d4 = 0x636d4,
+	BNXT_ULP_CLASS_HID_63c90 = 0x63c90,
+	BNXT_ULP_CLASS_HID_60070 = 0x60070,
+	BNXT_ULP_CLASS_HID_6062c = 0x6062c,
+	BNXT_ULP_CLASS_HID_65b28 = 0x65b28,
+	BNXT_ULP_CLASS_HID_640e4 = 0x640e4,
+	BNXT_ULP_CLASS_HID_624c4 = 0x624c4,
+	BNXT_ULP_CLASS_HID_62a80 = 0x62a80,
+	BNXT_ULP_CLASS_HID_605e4 = 0x605e4,
+	BNXT_ULP_CLASS_HID_60ba0 = 0x60ba0,
+	BNXT_ULP_CLASS_HID_64acc = 0x64acc,
+	BNXT_ULP_CLASS_HID_6157c = 0x6157c,
+	BNXT_ULP_CLASS_HID_62678 = 0x62678,
+	BNXT_ULP_CLASS_HID_62c34 = 0x62c34,
+	BNXT_ULP_CLASS_HID_63014 = 0x63014,
+	BNXT_ULP_CLASS_HID_639d0 = 0x639d0,
 	BNXT_ULP_CLASS_HID_353e0 = 0x353e0,
-	BNXT_ULP_CLASS_HID_3dce0 = 0x3dce0,
-	BNXT_ULP_CLASS_HID_20930 = 0x20930,
-	BNXT_ULP_CLASS_HID_2b230 = 0x2b230,
+	BNXT_ULP_CLASS_HID_359dc = 0x359dc,
+	BNXT_ULP_CLASS_HID_33dbc = 0x33dbc,
+	BNXT_ULP_CLASS_HID_32378 = 0x32378,
+	BNXT_ULP_CLASS_HID_31928 = 0x31928,
+	BNXT_ULP_CLASS_HID_31ee4 = 0x31ee4,
+	BNXT_ULP_CLASS_HID_35e10 = 0x35e10,
+	BNXT_ULP_CLASS_HID_347cc = 0x347cc,
 	BNXT_ULP_CLASS_HID_33f30 = 0x33f30,
-	BNXT_ULP_CLASS_HID_3a830 = 0x3a830,
-	BNXT_ULP_CLASS_HID_205e4 = 0x205e4,
-	BNXT_ULP_CLASS_HID_28ee4 = 0x28ee4,
-	BNXT_ULP_CLASS_HID_33be4 = 0x33be4,
-	BNXT_ULP_CLASS_HID_3a4e4 = 0x3a4e4,
-	BNXT_ULP_CLASS_HID_236d4 = 0x236d4,
-	BNXT_ULP_CLASS_HID_2a3d4 = 0x2a3d4,
-	BNXT_ULP_CLASS_HID_32cd4 = 0x32cd4,
-	BNXT_ULP_CLASS_HID_3d9d4 = 0x3d9d4,
-	BNXT_ULP_CLASS_HID_25e74 = 0x25e74,
+	BNXT_ULP_CLASS_HID_324ec = 0x324ec,
+	BNXT_ULP_CLASS_HID_308cc = 0x308cc,
+	BNXT_ULP_CLASS_HID_30e88 = 0x30e88,
+	BNXT_ULP_CLASS_HID_34384 = 0x34384,
+	BNXT_ULP_CLASS_HID_34940 = 0x34940,
+	BNXT_ULP_CLASS_HID_32d20 = 0x32d20,
+	BNXT_ULP_CLASS_HID_3531c = 0x3531c,
+	BNXT_ULP_CLASS_HID_72cd4 = 0x72cd4,
+	BNXT_ULP_CLASS_HID_75290 = 0x75290,
+	BNXT_ULP_CLASS_HID_73670 = 0x73670,
+	BNXT_ULP_CLASS_HID_73c2c = 0x73c2c,
+	BNXT_ULP_CLASS_HID_7121c = 0x7121c,
+	BNXT_ULP_CLASS_HID_71bd8 = 0x71bd8,
+	BNXT_ULP_CLASS_HID_75ac4 = 0x75ac4,
+	BNXT_ULP_CLASS_HID_74080 = 0x74080,
+	BNXT_ULP_CLASS_HID_73be4 = 0x73be4,
+	BNXT_ULP_CLASS_HID_721a0 = 0x721a0,
+	BNXT_ULP_CLASS_HID_70580 = 0x70580,
+	BNXT_ULP_CLASS_HID_70b7c = 0x70b7c,
+	BNXT_ULP_CLASS_HID_75c78 = 0x75c78,
+	BNXT_ULP_CLASS_HID_74234 = 0x74234,
+	BNXT_ULP_CLASS_HID_72614 = 0x72614,
+	BNXT_ULP_CLASS_HID_72fd0 = 0x72fd0,
+	BNXT_ULP_CLASS_HID_2a6e0 = 0x2a6e0,
+	BNXT_ULP_CLASS_HID_2acdc = 0x2acdc,
+	BNXT_ULP_CLASS_HID_2b0bc = 0x2b0bc,
+	BNXT_ULP_CLASS_HID_2b678 = 0x2b678,
 	BNXT_ULP_CLASS_HID_2cb74 = 0x2cb74,
-	BNXT_ULP_CLASS_HID_31928 = 0x31928,
-	BNXT_ULP_CLASS_HID_38228 = 0x38228,
-	BNXT_ULP_CLASS_HID_22d84 = 0x22d84,
+	BNXT_ULP_CLASS_HID_295e4 = 0x295e4,
+	BNXT_ULP_CLASS_HID_2d510 = 0x2d510,
+	BNXT_ULP_CLASS_HID_2dacc = 0x2dacc,
+	BNXT_ULP_CLASS_HID_2b230 = 0x2b230,
+	BNXT_ULP_CLASS_HID_2bbec = 0x2bbec,
+	BNXT_ULP_CLASS_HID_29fcc = 0x29fcc,
+	BNXT_ULP_CLASS_HID_28588 = 0x28588,
 	BNXT_ULP_CLASS_HID_2d684 = 0x2d684,
-	BNXT_ULP_CLASS_HID_34384 = 0x34384,
+	BNXT_ULP_CLASS_HID_2dc40 = 0x2dc40,
+	BNXT_ULP_CLASS_HID_2a020 = 0x2a020,
+	BNXT_ULP_CLASS_HID_2a61c = 0x2a61c,
+	BNXT_ULP_CLASS_HID_6a3d4 = 0x6a3d4,
+	BNXT_ULP_CLASS_HID_6a990 = 0x6a990,
+	BNXT_ULP_CLASS_HID_68d70 = 0x68d70,
+	BNXT_ULP_CLASS_HID_6b32c = 0x6b32c,
+	BNXT_ULP_CLASS_HID_6c428 = 0x6c428,
+	BNXT_ULP_CLASS_HID_6cde4 = 0x6cde4,
+	BNXT_ULP_CLASS_HID_6d1c4 = 0x6d1c4,
+	BNXT_ULP_CLASS_HID_6d780 = 0x6d780,
+	BNXT_ULP_CLASS_HID_68ee4 = 0x68ee4,
+	BNXT_ULP_CLASS_HID_6b4a0 = 0x6b4a0,
+	BNXT_ULP_CLASS_HID_69880 = 0x69880,
+	BNXT_ULP_CLASS_HID_69e7c = 0x69e7c,
+	BNXT_ULP_CLASS_HID_6d378 = 0x6d378,
+	BNXT_ULP_CLASS_HID_6d934 = 0x6d934,
+	BNXT_ULP_CLASS_HID_6bd14 = 0x6bd14,
+	BNXT_ULP_CLASS_HID_6a2d0 = 0x6a2d0,
+	BNXT_ULP_CLASS_HID_3dce0 = 0x3dce0,
+	BNXT_ULP_CLASS_HID_3c2dc = 0x3c2dc,
+	BNXT_ULP_CLASS_HID_3a6bc = 0x3a6bc,
+	BNXT_ULP_CLASS_HID_3ac78 = 0x3ac78,
+	BNXT_ULP_CLASS_HID_38228 = 0x38228,
+	BNXT_ULP_CLASS_HID_38be4 = 0x38be4,
+	BNXT_ULP_CLASS_HID_3cb10 = 0x3cb10,
+	BNXT_ULP_CLASS_HID_39580 = 0x39580,
+	BNXT_ULP_CLASS_HID_3a830 = 0x3a830,
+	BNXT_ULP_CLASS_HID_3d1ec = 0x3d1ec,
+	BNXT_ULP_CLASS_HID_3b5cc = 0x3b5cc,
+	BNXT_ULP_CLASS_HID_3bb88 = 0x3bb88,
 	BNXT_ULP_CLASS_HID_39178 = 0x39178,
-	BNXT_ULP_CLASS_HID_22678 = 0x22678,
-	BNXT_ULP_CLASS_HID_2d378 = 0x2d378,
-	BNXT_ULP_CLASS_HID_35c78 = 0x35c78,
-	BNXT_ULP_CLASS_HID_3c978 = 0x3c978,
-	BNXT_ULP_CLASS_HID_25b28 = 0x25b28,
-	BNXT_ULP_CLASS_HID_2c428 = 0x2c428,
-	BNXT_ULP_CLASS_HID_3121c = 0x3121c,
-	BNXT_ULP_CLASS_HID_39f1c = 0x39f1c,
+	BNXT_ULP_CLASS_HID_39734 = 0x39734,
+	BNXT_ULP_CLASS_HID_3d620 = 0x3d620,
+	BNXT_ULP_CLASS_HID_3dc1c = 0x3dc1c,
+	BNXT_ULP_CLASS_HID_7d9d4 = 0x7d9d4,
+	BNXT_ULP_CLASS_HID_7df90 = 0x7df90,
+	BNXT_ULP_CLASS_HID_7a370 = 0x7a370,
+	BNXT_ULP_CLASS_HID_7a92c = 0x7a92c,
+	BNXT_ULP_CLASS_HID_79f1c = 0x79f1c,
+	BNXT_ULP_CLASS_HID_784d8 = 0x784d8,
+	BNXT_ULP_CLASS_HID_7c7c4 = 0x7c7c4,
+	BNXT_ULP_CLASS_HID_7cd80 = 0x7cd80,
+	BNXT_ULP_CLASS_HID_7a4e4 = 0x7a4e4,
+	BNXT_ULP_CLASS_HID_7aaa0 = 0x7aaa0,
+	BNXT_ULP_CLASS_HID_78e80 = 0x78e80,
+	BNXT_ULP_CLASS_HID_7b47c = 0x7b47c,
+	BNXT_ULP_CLASS_HID_7c978 = 0x7c978,
+	BNXT_ULP_CLASS_HID_793e8 = 0x793e8,
+	BNXT_ULP_CLASS_HID_7d314 = 0x7d314,
+	BNXT_ULP_CLASS_HID_7d8d0 = 0x7d8d0,
+	BNXT_ULP_CLASS_HID_9ad8 = 0x9ad8,
+	BNXT_ULP_CLASS_HID_80e4 = 0x80e4,
+	BNXT_ULP_CLASS_HID_c3f0 = 0xc3f0,
+	BNXT_ULP_CLASS_HID_c9bc = 0xc9bc,
+	BNXT_ULP_CLASS_HID_bf4c = 0xbf4c,
+	BNXT_ULP_CLASS_HID_a508 = 0xa508,
+	BNXT_ULP_CLASS_HID_8928 = 0x8928,
+	BNXT_ULP_CLASS_HID_8ef4 = 0x8ef4,
+	BNXT_ULP_CLASS_HID_497ec = 0x497ec,
+	BNXT_ULP_CLASS_HID_49da8 = 0x49da8,
+	BNXT_ULP_CLASS_HID_4dc84 = 0x4dc84,
+	BNXT_ULP_CLASS_HID_4c240 = 0x4c240,
+	BNXT_ULP_CLASS_HID_4b810 = 0x4b810,
+	BNXT_ULP_CLASS_HID_4a1dc = 0x4a1dc,
+	BNXT_ULP_CLASS_HID_485fc = 0x485fc,
+	BNXT_ULP_CLASS_HID_48bb8 = 0x48bb8,
+	BNXT_ULP_CLASS_HID_1b0d8 = 0x1b0d8,
+	BNXT_ULP_CLASS_HID_1b6e4 = 0x1b6e4,
+	BNXT_ULP_CLASS_HID_19a84 = 0x19a84,
+	BNXT_ULP_CLASS_HID_18040 = 0x18040,
+	BNXT_ULP_CLASS_HID_1d54c = 0x1d54c,
+	BNXT_ULP_CLASS_HID_1db08 = 0x1db08,
+	BNXT_ULP_CLASS_HID_1bf28 = 0x1bf28,
+	BNXT_ULP_CLASS_HID_1a4f4 = 0x1a4f4,
+	BNXT_ULP_CLASS_HID_58dec = 0x58dec,
+	BNXT_ULP_CLASS_HID_5b3a8 = 0x5b3a8,
+	BNXT_ULP_CLASS_HID_59748 = 0x59748,
+	BNXT_ULP_CLASS_HID_59d14 = 0x59d14,
+	BNXT_ULP_CLASS_HID_5ae10 = 0x5ae10,
+	BNXT_ULP_CLASS_HID_5d7dc = 0x5d7dc,
+	BNXT_ULP_CLASS_HID_5bbfc = 0x5bbfc,
+	BNXT_ULP_CLASS_HID_5a1b8 = 0x5a1b8,
+	BNXT_ULP_CLASS_HID_c158 = 0xc158,
+	BNXT_ULP_CLASS_HID_c764 = 0xc764,
+	BNXT_ULP_CLASS_HID_c670 = 0xc670,
+	BNXT_ULP_CLASS_HID_d0c0 = 0xd0c0,
+	BNXT_ULP_CLASS_HID_e5cc = 0xe5cc,
+	BNXT_ULP_CLASS_HID_eb88 = 0xeb88,
+	BNXT_ULP_CLASS_HID_cfa8 = 0xcfa8,
+	BNXT_ULP_CLASS_HID_f574 = 0xf574,
+	BNXT_ULP_CLASS_HID_4da6c = 0x4da6c,
+	BNXT_ULP_CLASS_HID_4c028 = 0x4c028,
+	BNXT_ULP_CLASS_HID_4c304 = 0x4c304,
+	BNXT_ULP_CLASS_HID_4c8c0 = 0x4c8c0,
+	BNXT_ULP_CLASS_HID_4fe90 = 0x4fe90,
+	BNXT_ULP_CLASS_HID_4e45c = 0x4e45c,
+	BNXT_ULP_CLASS_HID_4c87c = 0x4c87c,
+	BNXT_ULP_CLASS_HID_4ce38 = 0x4ce38,
+	BNXT_ULP_CLASS_HID_1f758 = 0x1f758,
+	BNXT_ULP_CLASS_HID_1fd64 = 0x1fd64,
+	BNXT_ULP_CLASS_HID_1c104 = 0x1c104,
+	BNXT_ULP_CLASS_HID_1c6c0 = 0x1c6c0,
+	BNXT_ULP_CLASS_HID_1dbcc = 0x1dbcc,
+	BNXT_ULP_CLASS_HID_1c188 = 0x1c188,
+	BNXT_ULP_CLASS_HID_1e5a8 = 0x1e5a8,
+	BNXT_ULP_CLASS_HID_1eb74 = 0x1eb74,
+	BNXT_ULP_CLASS_HID_5f06c = 0x5f06c,
+	BNXT_ULP_CLASS_HID_5f628 = 0x5f628,
+	BNXT_ULP_CLASS_HID_5ddc8 = 0x5ddc8,
+	BNXT_ULP_CLASS_HID_5c394 = 0x5c394,
+	BNXT_ULP_CLASS_HID_5d490 = 0x5d490,
+	BNXT_ULP_CLASS_HID_5da5c = 0x5da5c,
+	BNXT_ULP_CLASS_HID_5fe7c = 0x5fe7c,
+	BNXT_ULP_CLASS_HID_5e438 = 0x5e438,
+	BNXT_ULP_CLASS_HID_bc18 = 0xbc18,
+	BNXT_ULP_CLASS_HID_a224 = 0xa224,
+	BNXT_ULP_CLASS_HID_e530 = 0xe530,
+	BNXT_ULP_CLASS_HID_eafc = 0xeafc,
+	BNXT_ULP_CLASS_HID_a08c = 0xa08c,
+	BNXT_ULP_CLASS_HID_a648 = 0xa648,
+	BNXT_ULP_CLASS_HID_aa68 = 0xaa68,
+	BNXT_ULP_CLASS_HID_b034 = 0xb034,
+	BNXT_ULP_CLASS_HID_4b92c = 0x4b92c,
+	BNXT_ULP_CLASS_HID_4bee8 = 0x4bee8,
+	BNXT_ULP_CLASS_HID_4e1c4 = 0x4e1c4,
+	BNXT_ULP_CLASS_HID_4e780 = 0x4e780,
+	BNXT_ULP_CLASS_HID_4bd50 = 0x4bd50,
+	BNXT_ULP_CLASS_HID_4a31c = 0x4a31c,
+	BNXT_ULP_CLASS_HID_4a73c = 0x4a73c,
+	BNXT_ULP_CLASS_HID_4acf8 = 0x4acf8,
+	BNXT_ULP_CLASS_HID_1b218 = 0x1b218,
+	BNXT_ULP_CLASS_HID_1b824 = 0x1b824,
+	BNXT_ULP_CLASS_HID_1bfc4 = 0x1bfc4,
+	BNXT_ULP_CLASS_HID_1a580 = 0x1a580,
+	BNXT_ULP_CLASS_HID_1f68c = 0x1f68c,
+	BNXT_ULP_CLASS_HID_1fc48 = 0x1fc48,
+	BNXT_ULP_CLASS_HID_1a068 = 0x1a068,
+	BNXT_ULP_CLASS_HID_1a634 = 0x1a634,
+	BNXT_ULP_CLASS_HID_5af2c = 0x5af2c,
+	BNXT_ULP_CLASS_HID_5b4e8 = 0x5b4e8,
+	BNXT_ULP_CLASS_HID_5b888 = 0x5b888,
+	BNXT_ULP_CLASS_HID_5be54 = 0x5be54,
+	BNXT_ULP_CLASS_HID_5f350 = 0x5f350,
+	BNXT_ULP_CLASS_HID_5f91c = 0x5f91c,
+	BNXT_ULP_CLASS_HID_5bd3c = 0x5bd3c,
+	BNXT_ULP_CLASS_HID_5a2f8 = 0x5a2f8,
+	BNXT_ULP_CLASS_HID_e298 = 0xe298,
+	BNXT_ULP_CLASS_HID_e8a4 = 0xe8a4,
+	BNXT_ULP_CLASS_HID_ebb0 = 0xebb0,
+	BNXT_ULP_CLASS_HID_f200 = 0xf200,
+	BNXT_ULP_CLASS_HID_e70c = 0xe70c,
+	BNXT_ULP_CLASS_HID_ecc8 = 0xecc8,
+	BNXT_ULP_CLASS_HID_f0e8 = 0xf0e8,
+	BNXT_ULP_CLASS_HID_f6b4 = 0xf6b4,
+	BNXT_ULP_CLASS_HID_4ffac = 0x4ffac,
+	BNXT_ULP_CLASS_HID_4e568 = 0x4e568,
+	BNXT_ULP_CLASS_HID_4e444 = 0x4e444,
+	BNXT_ULP_CLASS_HID_4ea00 = 0x4ea00,
+	BNXT_ULP_CLASS_HID_4e3d0 = 0x4e3d0,
+	BNXT_ULP_CLASS_HID_4e99c = 0x4e99c,
+	BNXT_ULP_CLASS_HID_4edbc = 0x4edbc,
+	BNXT_ULP_CLASS_HID_4f378 = 0x4f378,
+	BNXT_ULP_CLASS_HID_1f898 = 0x1f898,
+	BNXT_ULP_CLASS_HID_1fea4 = 0x1fea4,
+	BNXT_ULP_CLASS_HID_1e244 = 0x1e244,
+	BNXT_ULP_CLASS_HID_1e800 = 0x1e800,
+	BNXT_ULP_CLASS_HID_1fd0c = 0x1fd0c,
+	BNXT_ULP_CLASS_HID_1e2c8 = 0x1e2c8,
+	BNXT_ULP_CLASS_HID_1e6e8 = 0x1e6e8,
+	BNXT_ULP_CLASS_HID_1ecb4 = 0x1ecb4,
+	BNXT_ULP_CLASS_HID_5f5ac = 0x5f5ac,
+	BNXT_ULP_CLASS_HID_5fb68 = 0x5fb68,
+	BNXT_ULP_CLASS_HID_5ff08 = 0x5ff08,
+	BNXT_ULP_CLASS_HID_5e4d4 = 0x5e4d4,
+	BNXT_ULP_CLASS_HID_5f9d0 = 0x5f9d0,
+	BNXT_ULP_CLASS_HID_5ff9c = 0x5ff9c,
+	BNXT_ULP_CLASS_HID_5e3bc = 0x5e3bc,
+	BNXT_ULP_CLASS_HID_5e978 = 0x5e978,
+	BNXT_ULP_CLASS_HID_34f6 = 0x34f6,
+	BNXT_ULP_CLASS_HID_3a3a = 0x3a3a,
+	BNXT_ULP_CLASS_HID_541e = 0x541e,
+	BNXT_ULP_CLASS_HID_5a22 = 0x5a22,
+	BNXT_ULP_CLASS_HID_34fe = 0x34fe,
+	BNXT_ULP_CLASS_HID_3a32 = 0x3a32,
+	BNXT_ULP_CLASS_HID_4a42 = 0x4a42,
+	BNXT_ULP_CLASS_HID_14d2 = 0x14d2,
+	BNXT_ULP_CLASS_HID_34c8 = 0x34c8,
+	BNXT_ULP_CLASS_HID_3a04 = 0x3a04,
+	BNXT_ULP_CLASS_HID_1e64 = 0x1e64,
+	BNXT_ULP_CLASS_HID_07a0 = 0x07a0,
+	BNXT_ULP_CLASS_HID_595c = 0x595c,
+	BNXT_ULP_CLASS_HID_5e98 = 0x5e98,
+	BNXT_ULP_CLASS_HID_22f8 = 0x22f8,
+	BNXT_ULP_CLASS_HID_2834 = 0x2834,
+	BNXT_ULP_CLASS_HID_0398 = 0x0398,
+	BNXT_ULP_CLASS_HID_09d4 = 0x09d4,
+	BNXT_ULP_CLASS_HID_48c0 = 0x48c0,
+	BNXT_ULP_CLASS_HID_1370 = 0x1370,
+	BNXT_ULP_CLASS_HID_246c = 0x246c,
+	BNXT_ULP_CLASS_HID_2da8 = 0x2da8,
+	BNXT_ULP_CLASS_HID_3188 = 0x3188,
+	BNXT_ULP_CLASS_HID_37c4 = 0x37c4,
+	BNXT_ULP_CLASS_HID_34f0 = 0x34f0,
+	BNXT_ULP_CLASS_HID_3a3c = 0x3a3c,
+	BNXT_ULP_CLASS_HID_1e5c = 0x1e5c,
+	BNXT_ULP_CLASS_HID_0798 = 0x0798,
+	BNXT_ULP_CLASS_HID_5964 = 0x5964,
+	BNXT_ULP_CLASS_HID_5ea0 = 0x5ea0,
+	BNXT_ULP_CLASS_HID_22c0 = 0x22c0,
+	BNXT_ULP_CLASS_HID_280c = 0x280c,
+	BNXT_ULP_CLASS_HID_43104 = 0x43104,
+	BNXT_ULP_CLASS_HID_43740 = 0x43740,
+	BNXT_ULP_CLASS_HID_41b60 = 0x41b60,
+	BNXT_ULP_CLASS_HID_400ac = 0x400ac,
+	BNXT_ULP_CLASS_HID_455a8 = 0x455a8,
+	BNXT_ULP_CLASS_HID_45bf4 = 0x45bf4,
+	BNXT_ULP_CLASS_HID_43f14 = 0x43f14,
+	BNXT_ULP_CLASS_HID_42550 = 0x42550,
+	BNXT_ULP_CLASS_HID_34d6 = 0x34d6,
+	BNXT_ULP_CLASS_HID_3a1a = 0x3a1a,
+	BNXT_ULP_CLASS_HID_543e = 0x543e,
+	BNXT_ULP_CLASS_HID_5a02 = 0x5a02,
+	BNXT_ULP_CLASS_HID_34de = 0x34de,
+	BNXT_ULP_CLASS_HID_3a12 = 0x3a12,
+	BNXT_ULP_CLASS_HID_4a62 = 0x4a62,
+	BNXT_ULP_CLASS_HID_14f2 = 0x14f2,
+	BNXT_ULP_CLASS_HID_34b6 = 0x34b6,
+	BNXT_ULP_CLASS_HID_3a7a = 0x3a7a,
+	BNXT_ULP_CLASS_HID_545e = 0x545e,
+	BNXT_ULP_CLASS_HID_5a62 = 0x5a62,
+	BNXT_ULP_CLASS_HID_34be = 0x34be,
+	BNXT_ULP_CLASS_HID_3a72 = 0x3a72,
+	BNXT_ULP_CLASS_HID_4a02 = 0x4a02,
+	BNXT_ULP_CLASS_HID_1492 = 0x1492,
+	BNXT_ULP_CLASS_HID_34a8 = 0x34a8,
+	BNXT_ULP_CLASS_HID_3a64 = 0x3a64,
+	BNXT_ULP_CLASS_HID_1e04 = 0x1e04,
+	BNXT_ULP_CLASS_HID_07c0 = 0x07c0,
+	BNXT_ULP_CLASS_HID_593c = 0x593c,
+	BNXT_ULP_CLASS_HID_5ef8 = 0x5ef8,
+	BNXT_ULP_CLASS_HID_2298 = 0x2298,
+	BNXT_ULP_CLASS_HID_2854 = 0x2854,
+	BNXT_ULP_CLASS_HID_03f8 = 0x03f8,
+	BNXT_ULP_CLASS_HID_09b4 = 0x09b4,
+	BNXT_ULP_CLASS_HID_48a0 = 0x48a0,
+	BNXT_ULP_CLASS_HID_1310 = 0x1310,
+	BNXT_ULP_CLASS_HID_240c = 0x240c,
+	BNXT_ULP_CLASS_HID_2dc8 = 0x2dc8,
+	BNXT_ULP_CLASS_HID_31e8 = 0x31e8,
+	BNXT_ULP_CLASS_HID_37a4 = 0x37a4,
+	BNXT_ULP_CLASS_HID_34d0 = 0x34d0,
+	BNXT_ULP_CLASS_HID_3a1c = 0x3a1c,
+	BNXT_ULP_CLASS_HID_1e7c = 0x1e7c,
+	BNXT_ULP_CLASS_HID_07b8 = 0x07b8,
+	BNXT_ULP_CLASS_HID_5944 = 0x5944,
+	BNXT_ULP_CLASS_HID_5e80 = 0x5e80,
+	BNXT_ULP_CLASS_HID_22e0 = 0x22e0,
+	BNXT_ULP_CLASS_HID_282c = 0x282c,
+	BNXT_ULP_CLASS_HID_43124 = 0x43124,
+	BNXT_ULP_CLASS_HID_43760 = 0x43760,
+	BNXT_ULP_CLASS_HID_41b40 = 0x41b40,
+	BNXT_ULP_CLASS_HID_4008c = 0x4008c,
+	BNXT_ULP_CLASS_HID_45588 = 0x45588,
+	BNXT_ULP_CLASS_HID_45bd4 = 0x45bd4,
+	BNXT_ULP_CLASS_HID_43f34 = 0x43f34,
+	BNXT_ULP_CLASS_HID_42570 = 0x42570,
 	BNXT_ULP_CLASS_HID_3488 = 0x3488,
 	BNXT_ULP_CLASS_HID_3a44 = 0x3a44,
-	BNXT_ULP_CLASS_HID_0994 = 0x0994,
-	BNXT_ULP_CLASS_HID_5ed8 = 0x5ed8,
-	BNXT_ULP_CLASS_HID_2de8 = 0x2de8,
+	BNXT_ULP_CLASS_HID_1e24 = 0x1e24,
 	BNXT_ULP_CLASS_HID_07e0 = 0x07e0,
-	BNXT_ULP_CLASS_HID_1330 = 0x1330,
+	BNXT_ULP_CLASS_HID_591c = 0x591c,
+	BNXT_ULP_CLASS_HID_5ed8 = 0x5ed8,
+	BNXT_ULP_CLASS_HID_22b8 = 0x22b8,
 	BNXT_ULP_CLASS_HID_2874 = 0x2874,
-	BNXT_ULP_CLASS_HID_3784 = 0x3784,
 	BNXT_ULP_CLASS_HID_03d8 = 0x03d8,
-	BNXT_ULP_CLASS_HID_591c = 0x591c,
-	BNXT_ULP_CLASS_HID_242c = 0x242c,
-	BNXT_ULP_CLASS_HID_1e24 = 0x1e24,
+	BNXT_ULP_CLASS_HID_0994 = 0x0994,
 	BNXT_ULP_CLASS_HID_4880 = 0x4880,
-	BNXT_ULP_CLASS_HID_22b8 = 0x22b8,
-	BNXT_ULP_CLASS_HID_31c8 = 0x31c8
+	BNXT_ULP_CLASS_HID_1330 = 0x1330,
+	BNXT_ULP_CLASS_HID_242c = 0x242c,
+	BNXT_ULP_CLASS_HID_2de8 = 0x2de8,
+	BNXT_ULP_CLASS_HID_31c8 = 0x31c8,
+	BNXT_ULP_CLASS_HID_3784 = 0x3784,
+	BNXT_ULP_CLASS_HID_34b0 = 0x34b0,
+	BNXT_ULP_CLASS_HID_3a7c = 0x3a7c,
+	BNXT_ULP_CLASS_HID_1e1c = 0x1e1c,
+	BNXT_ULP_CLASS_HID_07d8 = 0x07d8,
+	BNXT_ULP_CLASS_HID_5924 = 0x5924,
+	BNXT_ULP_CLASS_HID_5ee0 = 0x5ee0,
+	BNXT_ULP_CLASS_HID_2280 = 0x2280,
+	BNXT_ULP_CLASS_HID_284c = 0x284c,
+	BNXT_ULP_CLASS_HID_43144 = 0x43144,
+	BNXT_ULP_CLASS_HID_43700 = 0x43700,
+	BNXT_ULP_CLASS_HID_41b20 = 0x41b20,
+	BNXT_ULP_CLASS_HID_400ec = 0x400ec,
+	BNXT_ULP_CLASS_HID_455e8 = 0x455e8,
+	BNXT_ULP_CLASS_HID_45bb4 = 0x45bb4,
+	BNXT_ULP_CLASS_HID_43f54 = 0x43f54,
+	BNXT_ULP_CLASS_HID_42510 = 0x42510
 };
 
 enum bnxt_ulp_act_hid {
@@ -5095,11 +5693,8 @@ enum bnxt_ulp_act_hid {
 };
 
 enum bnxt_ulp_df_tpl {
-	BNXT_ULP_DF_TPL_PORT_TO_VS = 3,
-	BNXT_ULP_DF_TPL_VS_TO_PORT = 4,
-	BNXT_ULP_DF_TPL_VFREP_TO_VF = 5,
-	BNXT_ULP_DF_TPL_VF_TO_VFREP = 6,
-	BNXT_ULP_DF_TPL_LOOPBACK_ACTION_REC = 7
+	BNXT_ULP_DF_TPL_DEFAULT_UPLINK_PORT = 3,
+	BNXT_ULP_DF_TPL_DEFAULT_VFR = 4
 };
 
 #endif
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_field.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_field.h
index f7dd91626a..3a3b609941 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_field.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_field.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
-/* date: Wed Dec 16 16:03:45 2020 */
+/* date: Wed Mar  3 12:15:37 2021 */
 
 #ifndef ULP_HDR_FIELD_ENUMS_H_
 #define ULP_HDR_FIELD_ENUMS_H_
@@ -19,6 +19,16 @@ enum bnxt_ulp_glb_hf {
 	BNXT_ULP_GLB_HF_ID_I_ETH_TYPE,
 	BNXT_ULP_GLB_HF_ID_T_GRE_VER,
 	BNXT_ULP_GLB_HF_ID_T_GRE_PROTO_TYPE,
+	BNXT_ULP_GLB_HF_ID_O_ICMP_TYPE,
+	BNXT_ULP_GLB_HF_ID_I_ICMP_TYPE,
+	BNXT_ULP_GLB_HF_ID_O_ICMP_CODE,
+	BNXT_ULP_GLB_HF_ID_I_ICMP_CODE,
+	BNXT_ULP_GLB_HF_ID_O_ICMP_CSUM,
+	BNXT_ULP_GLB_HF_ID_I_ICMP_CSUM,
+	BNXT_ULP_GLB_HF_ID_O_ICMP_IDENT,
+	BNXT_ULP_GLB_HF_ID_I_ICMP_IDENT,
+	BNXT_ULP_GLB_HF_ID_O_ICMP_SEQ_NUM,
+	BNXT_ULP_GLB_HF_ID_I_ICMP_SEQ_NUM,
 	BNXT_ULP_GLB_HF_ID_O_IPV4_VER,
 	BNXT_ULP_GLB_HF_ID_I_IPV4_VER,
 	BNXT_ULP_GLB_HF_ID_O_IPV4_TOS,
@@ -55,16 +65,6 @@ enum bnxt_ulp_glb_hf {
 	BNXT_ULP_GLB_HF_ID_I_IPV6_SRC_ADDR,
 	BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR,
 	BNXT_ULP_GLB_HF_ID_I_IPV6_DST_ADDR,
-	BNXT_ULP_GLB_HF_ID_O_L3_PROTO_ID,
-	BNXT_ULP_GLB_HF_ID_I_L3_PROTO_ID,
-	BNXT_ULP_GLB_HF_ID_O_L3_SRC_ADDR,
-	BNXT_ULP_GLB_HF_ID_I_L3_SRC_ADDR,
-	BNXT_ULP_GLB_HF_ID_O_L3_DST_ADDR,
-	BNXT_ULP_GLB_HF_ID_I_L3_DST_ADDR,
-	BNXT_ULP_GLB_HF_ID_O_L4_SRC_PORT,
-	BNXT_ULP_GLB_HF_ID_I_L4_SRC_PORT,
-	BNXT_ULP_GLB_HF_ID_O_L4_DST_PORT,
-	BNXT_ULP_GLB_HF_ID_I_L4_DST_PORT,
 	BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT,
 	BNXT_ULP_GLB_HF_ID_I_TCP_SRC_PORT,
 	BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT,
@@ -115,16 +115,14 @@ enum bnxt_ulp_hf1_0_bitmask {
 	BNXT_ULP_HF1_0_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF1_0_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF1_0_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_VER         = 0x0400000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
-	BNXT_ULP_HF1_0_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000
+	BNXT_ULP_HF1_0_BITMASK_O_IPV6_VER         = 0x0400000000000000,
+	BNXT_ULP_HF1_0_BITMASK_O_IPV6_TC          = 0x0200000000000000,
+	BNXT_ULP_HF1_0_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
+	BNXT_ULP_HF1_0_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
+	BNXT_ULP_HF1_0_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
+	BNXT_ULP_HF1_0_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF1_0_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF1_0_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000
 };
 
 enum bnxt_ulp_hf1_1_bitmask {
@@ -142,16 +140,7 @@ enum bnxt_ulp_hf1_1_bitmask {
 	BNXT_ULP_HF1_1_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
 	BNXT_ULP_HF1_1_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
 	BNXT_ULP_HF1_1_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_TCP_SRC_PORT     = 0x0001000000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_TCP_DST_PORT     = 0x0000800000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_TCP_SENT_SEQ     = 0x0000400000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_TCP_RECV_ACK     = 0x0000200000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_TCP_DATA_OFF     = 0x0000100000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_TCP_TCP_FLAGS    = 0x0000080000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_TCP_RX_WIN       = 0x0000040000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_TCP_CSUM         = 0x0000020000000000,
-	BNXT_ULP_HF1_1_BITMASK_O_TCP_URP          = 0x0000010000000000
+	BNXT_ULP_HF1_1_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000
 };
 
 enum bnxt_ulp_hf1_2_bitmask {
@@ -160,20 +149,17 @@ enum bnxt_ulp_hf1_2_bitmask {
 	BNXT_ULP_HF1_2_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF1_2_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF1_2_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_VER         = 0x0400000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_UDP_SRC_PORT     = 0x0001000000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_UDP_DST_PORT     = 0x0000800000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_UDP_LENGTH       = 0x0000400000000000,
-	BNXT_ULP_HF1_2_BITMASK_O_UDP_CSUM         = 0x0000200000000000
+	BNXT_ULP_HF1_2_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF1_2_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF1_2_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF1_2_BITMASK_O_IPV6_VER         = 0x0080000000000000,
+	BNXT_ULP_HF1_2_BITMASK_O_IPV6_TC          = 0x0040000000000000,
+	BNXT_ULP_HF1_2_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
+	BNXT_ULP_HF1_2_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
+	BNXT_ULP_HF1_2_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
+	BNXT_ULP_HF1_2_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF1_2_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF1_2_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000
 };
 
 enum bnxt_ulp_hf1_3_bitmask {
@@ -182,14 +168,19 @@ enum bnxt_ulp_hf1_3_bitmask {
 	BNXT_ULP_HF1_3_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF1_3_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF1_3_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF1_3_BITMASK_O_IPV6_VER         = 0x0400000000000000,
-	BNXT_ULP_HF1_3_BITMASK_O_IPV6_TC          = 0x0200000000000000,
-	BNXT_ULP_HF1_3_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
-	BNXT_ULP_HF1_3_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
-	BNXT_ULP_HF1_3_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
-	BNXT_ULP_HF1_3_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
-	BNXT_ULP_HF1_3_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
-	BNXT_ULP_HF1_3_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000
+	BNXT_ULP_HF1_3_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF1_3_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF1_3_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_VER         = 0x0080000000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
+	BNXT_ULP_HF1_3_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000
 };
 
 enum bnxt_ulp_hf1_4_bitmask {
@@ -223,18 +214,25 @@ enum bnxt_ulp_hf1_5_bitmask {
 	BNXT_ULP_HF1_5_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF1_5_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF1_5_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_IPV6_VER         = 0x0400000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_IPV6_TC          = 0x0200000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_UDP_SRC_PORT     = 0x0004000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_UDP_DST_PORT     = 0x0002000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_UDP_LENGTH       = 0x0001000000000000,
-	BNXT_ULP_HF1_5_BITMASK_O_UDP_CSUM         = 0x0000800000000000
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_VER         = 0x0400000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_TCP_SRC_PORT     = 0x0001000000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_TCP_DST_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_TCP_SENT_SEQ     = 0x0000400000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_TCP_RECV_ACK     = 0x0000200000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_TCP_DATA_OFF     = 0x0000100000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_TCP_TCP_FLAGS    = 0x0000080000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_TCP_RX_WIN       = 0x0000040000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_TCP_CSUM         = 0x0000020000000000,
+	BNXT_ULP_HF1_5_BITMASK_O_TCP_URP          = 0x0000010000000000
 };
 
 enum bnxt_ulp_hf1_6_bitmask {
@@ -243,19 +241,18 @@ enum bnxt_ulp_hf1_6_bitmask {
 	BNXT_ULP_HF1_6_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF1_6_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF1_6_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF1_6_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
-	BNXT_ULP_HF1_6_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
-	BNXT_ULP_HF1_6_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_VER         = 0x0080000000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
-	BNXT_ULP_HF1_6_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000
+	BNXT_ULP_HF1_6_BITMASK_O_IPV6_VER         = 0x0400000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_IPV6_TC          = 0x0200000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_UDP_SRC_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_UDP_DST_PORT     = 0x0002000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_UDP_LENGTH       = 0x0001000000000000,
+	BNXT_ULP_HF1_6_BITMASK_O_UDP_CSUM         = 0x0000800000000000
 };
 
 enum bnxt_ulp_hf1_7_bitmask {
@@ -264,28 +261,20 @@ enum bnxt_ulp_hf1_7_bitmask {
 	BNXT_ULP_HF1_7_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF1_7_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF1_7_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF1_7_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
-	BNXT_ULP_HF1_7_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
-	BNXT_ULP_HF1_7_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_VER         = 0x0080000000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_TCP_SRC_PORT     = 0x0000200000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_TCP_DST_PORT     = 0x0000100000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_TCP_SENT_SEQ     = 0x0000080000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_TCP_RECV_ACK     = 0x0000040000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_TCP_DATA_OFF     = 0x0000020000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_TCP_TCP_FLAGS    = 0x0000010000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_TCP_RX_WIN       = 0x0000008000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_TCP_CSUM         = 0x0000004000000000,
-	BNXT_ULP_HF1_7_BITMASK_O_TCP_URP          = 0x0000002000000000
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_VER         = 0x0400000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_UDP_SRC_PORT     = 0x0001000000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_UDP_DST_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_UDP_LENGTH       = 0x0000400000000000,
+	BNXT_ULP_HF1_7_BITMASK_O_UDP_CSUM         = 0x0000200000000000
 };
 
 enum bnxt_ulp_hf1_8_bitmask {
@@ -297,20 +286,23 @@ enum bnxt_ulp_hf1_8_bitmask {
 	BNXT_ULP_HF1_8_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
 	BNXT_ULP_HF1_8_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
 	BNXT_ULP_HF1_8_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_VER         = 0x0080000000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_UDP_SRC_PORT     = 0x0000200000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_UDP_DST_PORT     = 0x0000100000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_UDP_LENGTH       = 0x0000080000000000,
-	BNXT_ULP_HF1_8_BITMASK_O_UDP_CSUM         = 0x0000040000000000
+	BNXT_ULP_HF1_8_BITMASK_O_IPV6_VER         = 0x0080000000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_IPV6_TC          = 0x0040000000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_TCP_SRC_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_TCP_DST_PORT     = 0x0000400000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_TCP_SENT_SEQ     = 0x0000200000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_TCP_RECV_ACK     = 0x0000100000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_TCP_DATA_OFF     = 0x0000080000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_TCP_TCP_FLAGS    = 0x0000040000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_TCP_RX_WIN       = 0x0000020000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_TCP_CSUM         = 0x0000010000000000,
+	BNXT_ULP_HF1_8_BITMASK_O_TCP_URP          = 0x0000008000000000
 };
 
 enum bnxt_ulp_hf1_9_bitmask {
@@ -322,14 +314,25 @@ enum bnxt_ulp_hf1_9_bitmask {
 	BNXT_ULP_HF1_9_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
 	BNXT_ULP_HF1_9_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
 	BNXT_ULP_HF1_9_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF1_9_BITMASK_O_IPV6_VER         = 0x0080000000000000,
-	BNXT_ULP_HF1_9_BITMASK_O_IPV6_TC          = 0x0040000000000000,
-	BNXT_ULP_HF1_9_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
-	BNXT_ULP_HF1_9_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
-	BNXT_ULP_HF1_9_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
-	BNXT_ULP_HF1_9_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF1_9_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
-	BNXT_ULP_HF1_9_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_VER         = 0x0080000000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_TCP_SRC_PORT     = 0x0000200000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_TCP_DST_PORT     = 0x0000100000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_TCP_SENT_SEQ     = 0x0000080000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_TCP_RECV_ACK     = 0x0000040000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_TCP_DATA_OFF     = 0x0000020000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_TCP_TCP_FLAGS    = 0x0000010000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_TCP_RX_WIN       = 0x0000008000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_TCP_CSUM         = 0x0000004000000000,
+	BNXT_ULP_HF1_9_BITMASK_O_TCP_URP          = 0x0000002000000000
 };
 
 enum bnxt_ulp_hf1_10_bitmask {
@@ -349,15 +352,10 @@ enum bnxt_ulp_hf1_10_bitmask {
 	BNXT_ULP_HF1_10_BITMASK_O_IPV6_TTL        = 0x0004000000000000,
 	BNXT_ULP_HF1_10_BITMASK_O_IPV6_SRC_ADDR   = 0x0002000000000000,
 	BNXT_ULP_HF1_10_BITMASK_O_IPV6_DST_ADDR   = 0x0001000000000000,
-	BNXT_ULP_HF1_10_BITMASK_O_TCP_SRC_PORT    = 0x0000800000000000,
-	BNXT_ULP_HF1_10_BITMASK_O_TCP_DST_PORT    = 0x0000400000000000,
-	BNXT_ULP_HF1_10_BITMASK_O_TCP_SENT_SEQ    = 0x0000200000000000,
-	BNXT_ULP_HF1_10_BITMASK_O_TCP_RECV_ACK    = 0x0000100000000000,
-	BNXT_ULP_HF1_10_BITMASK_O_TCP_DATA_OFF    = 0x0000080000000000,
-	BNXT_ULP_HF1_10_BITMASK_O_TCP_TCP_FLAGS   = 0x0000040000000000,
-	BNXT_ULP_HF1_10_BITMASK_O_TCP_RX_WIN      = 0x0000020000000000,
-	BNXT_ULP_HF1_10_BITMASK_O_TCP_CSUM        = 0x0000010000000000,
-	BNXT_ULP_HF1_10_BITMASK_O_TCP_URP         = 0x0000008000000000
+	BNXT_ULP_HF1_10_BITMASK_O_UDP_SRC_PORT    = 0x0000800000000000,
+	BNXT_ULP_HF1_10_BITMASK_O_UDP_DST_PORT    = 0x0000400000000000,
+	BNXT_ULP_HF1_10_BITMASK_O_UDP_LENGTH      = 0x0000200000000000,
+	BNXT_ULP_HF1_10_BITMASK_O_UDP_CSUM        = 0x0000100000000000
 };
 
 enum bnxt_ulp_hf1_11_bitmask {
@@ -369,18 +367,46 @@ enum bnxt_ulp_hf1_11_bitmask {
 	BNXT_ULP_HF1_11_BITMASK_OO_VLAN_CFI_PRI   = 0x0400000000000000,
 	BNXT_ULP_HF1_11_BITMASK_OO_VLAN_VID       = 0x0200000000000000,
 	BNXT_ULP_HF1_11_BITMASK_OO_VLAN_TYPE      = 0x0100000000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_IPV6_VER        = 0x0080000000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_IPV6_TC         = 0x0040000000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_IPV6_FLOW_LABEL = 0x0020000000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_IPV6_PROTO_ID   = 0x0008000000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_IPV6_TTL        = 0x0004000000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_IPV6_SRC_ADDR   = 0x0002000000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_IPV6_DST_ADDR   = 0x0001000000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT    = 0x0000800000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT    = 0x0000400000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_UDP_LENGTH      = 0x0000200000000000,
-	BNXT_ULP_HF1_11_BITMASK_O_UDP_CSUM        = 0x0000100000000000
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_VER        = 0x0080000000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_TOS        = 0x0040000000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_LEN        = 0x0020000000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_FRAG_ID    = 0x0010000000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_FRAG_OFF   = 0x0008000000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_TTL        = 0x0004000000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_PROTO_ID   = 0x0002000000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_CSUM       = 0x0001000000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_SRC_ADDR   = 0x0000800000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_IPV4_DST_ADDR   = 0x0000400000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_UDP_SRC_PORT    = 0x0000200000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_UDP_DST_PORT    = 0x0000100000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_UDP_LENGTH      = 0x0000080000000000,
+	BNXT_ULP_HF1_11_BITMASK_O_UDP_CSUM        = 0x0000040000000000
+};
+
+enum bnxt_ulp_hf1_12_bitmask {
+	BNXT_ULP_HF1_12_BITMASK_WM                = 0x8000000000000000,
+	BNXT_ULP_HF1_12_BITMASK_SVIF_INDEX        = 0x4000000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_ETH_DMAC        = 0x2000000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_ETH_SMAC        = 0x1000000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_ETH_TYPE        = 0x0800000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_VER        = 0x0400000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_TOS        = 0x0200000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_LEN        = 0x0100000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_FRAG_ID    = 0x0080000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_FRAG_OFF   = 0x0040000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_TTL        = 0x0020000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_PROTO_ID   = 0x0010000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_CSUM       = 0x0008000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_SRC_ADDR   = 0x0004000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_IPV4_DST_ADDR   = 0x0002000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_UDP_SRC_PORT    = 0x0001000000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_UDP_DST_PORT    = 0x0000800000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_UDP_LENGTH      = 0x0000400000000000,
+	BNXT_ULP_HF1_12_BITMASK_O_UDP_CSUM        = 0x0000200000000000,
+	BNXT_ULP_HF1_12_BITMASK_T_VXLAN_FLAGS     = 0x0000100000000000,
+	BNXT_ULP_HF1_12_BITMASK_T_VXLAN_RSVD0     = 0x0000080000000000,
+	BNXT_ULP_HF1_12_BITMASK_T_VXLAN_VNI       = 0x0000040000000000,
+	BNXT_ULP_HF1_12_BITMASK_T_VXLAN_RSVD1     = 0x0000020000000000
 };
 
 enum bnxt_ulp_hf2_0_bitmask {
@@ -389,16 +415,14 @@ enum bnxt_ulp_hf2_0_bitmask {
 	BNXT_ULP_HF2_0_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF2_0_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF2_0_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_VER         = 0x0400000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
-	BNXT_ULP_HF2_0_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000
+	BNXT_ULP_HF2_0_BITMASK_O_IPV6_VER         = 0x0400000000000000,
+	BNXT_ULP_HF2_0_BITMASK_O_IPV6_TC          = 0x0200000000000000,
+	BNXT_ULP_HF2_0_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
+	BNXT_ULP_HF2_0_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
+	BNXT_ULP_HF2_0_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
+	BNXT_ULP_HF2_0_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF2_0_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF2_0_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000
 };
 
 enum bnxt_ulp_hf2_1_bitmask {
@@ -416,16 +440,7 @@ enum bnxt_ulp_hf2_1_bitmask {
 	BNXT_ULP_HF2_1_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
 	BNXT_ULP_HF2_1_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
 	BNXT_ULP_HF2_1_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_TCP_SRC_PORT     = 0x0001000000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_TCP_DST_PORT     = 0x0000800000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_TCP_SENT_SEQ     = 0x0000400000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_TCP_RECV_ACK     = 0x0000200000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_TCP_DATA_OFF     = 0x0000100000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_TCP_TCP_FLAGS    = 0x0000080000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_TCP_RX_WIN       = 0x0000040000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_TCP_CSUM         = 0x0000020000000000,
-	BNXT_ULP_HF2_1_BITMASK_O_TCP_URP          = 0x0000010000000000
+	BNXT_ULP_HF2_1_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000
 };
 
 enum bnxt_ulp_hf2_2_bitmask {
@@ -434,20 +449,17 @@ enum bnxt_ulp_hf2_2_bitmask {
 	BNXT_ULP_HF2_2_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF2_2_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF2_2_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_VER         = 0x0400000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_UDP_SRC_PORT     = 0x0001000000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_UDP_DST_PORT     = 0x0000800000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_UDP_LENGTH       = 0x0000400000000000,
-	BNXT_ULP_HF2_2_BITMASK_O_UDP_CSUM         = 0x0000200000000000
+	BNXT_ULP_HF2_2_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF2_2_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF2_2_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF2_2_BITMASK_O_IPV6_VER         = 0x0080000000000000,
+	BNXT_ULP_HF2_2_BITMASK_O_IPV6_TC          = 0x0040000000000000,
+	BNXT_ULP_HF2_2_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
+	BNXT_ULP_HF2_2_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
+	BNXT_ULP_HF2_2_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
+	BNXT_ULP_HF2_2_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF2_2_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF2_2_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000
 };
 
 enum bnxt_ulp_hf2_3_bitmask {
@@ -456,14 +468,19 @@ enum bnxt_ulp_hf2_3_bitmask {
 	BNXT_ULP_HF2_3_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF2_3_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF2_3_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF2_3_BITMASK_O_IPV6_VER         = 0x0400000000000000,
-	BNXT_ULP_HF2_3_BITMASK_O_IPV6_TC          = 0x0200000000000000,
-	BNXT_ULP_HF2_3_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
-	BNXT_ULP_HF2_3_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
-	BNXT_ULP_HF2_3_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
-	BNXT_ULP_HF2_3_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
-	BNXT_ULP_HF2_3_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
-	BNXT_ULP_HF2_3_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000
+	BNXT_ULP_HF2_3_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF2_3_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF2_3_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_VER         = 0x0080000000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
+	BNXT_ULP_HF2_3_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000
 };
 
 enum bnxt_ulp_hf2_4_bitmask {
@@ -497,18 +514,25 @@ enum bnxt_ulp_hf2_5_bitmask {
 	BNXT_ULP_HF2_5_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF2_5_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF2_5_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_IPV6_VER         = 0x0400000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_IPV6_TC          = 0x0200000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_UDP_SRC_PORT     = 0x0004000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_UDP_DST_PORT     = 0x0002000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_UDP_LENGTH       = 0x0001000000000000,
-	BNXT_ULP_HF2_5_BITMASK_O_UDP_CSUM         = 0x0000800000000000
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_VER         = 0x0400000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_TCP_SRC_PORT     = 0x0001000000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_TCP_DST_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_TCP_SENT_SEQ     = 0x0000400000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_TCP_RECV_ACK     = 0x0000200000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_TCP_DATA_OFF     = 0x0000100000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_TCP_TCP_FLAGS    = 0x0000080000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_TCP_RX_WIN       = 0x0000040000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_TCP_CSUM         = 0x0000020000000000,
+	BNXT_ULP_HF2_5_BITMASK_O_TCP_URP          = 0x0000010000000000
 };
 
 enum bnxt_ulp_hf2_6_bitmask {
@@ -517,19 +541,18 @@ enum bnxt_ulp_hf2_6_bitmask {
 	BNXT_ULP_HF2_6_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF2_6_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF2_6_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF2_6_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
-	BNXT_ULP_HF2_6_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
-	BNXT_ULP_HF2_6_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_VER         = 0x0080000000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
-	BNXT_ULP_HF2_6_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000
+	BNXT_ULP_HF2_6_BITMASK_O_IPV6_VER         = 0x0400000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_IPV6_TC          = 0x0200000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_UDP_SRC_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_UDP_DST_PORT     = 0x0002000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_UDP_LENGTH       = 0x0001000000000000,
+	BNXT_ULP_HF2_6_BITMASK_O_UDP_CSUM         = 0x0000800000000000
 };
 
 enum bnxt_ulp_hf2_7_bitmask {
@@ -538,28 +561,20 @@ enum bnxt_ulp_hf2_7_bitmask {
 	BNXT_ULP_HF2_7_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
 	BNXT_ULP_HF2_7_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
 	BNXT_ULP_HF2_7_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF2_7_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
-	BNXT_ULP_HF2_7_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
-	BNXT_ULP_HF2_7_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_VER         = 0x0080000000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_TCP_SRC_PORT     = 0x0000200000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_TCP_DST_PORT     = 0x0000100000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_TCP_SENT_SEQ     = 0x0000080000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_TCP_RECV_ACK     = 0x0000040000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_TCP_DATA_OFF     = 0x0000020000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_TCP_TCP_FLAGS    = 0x0000010000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_TCP_RX_WIN       = 0x0000008000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_TCP_CSUM         = 0x0000004000000000,
-	BNXT_ULP_HF2_7_BITMASK_O_TCP_URP          = 0x0000002000000000
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_VER         = 0x0400000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_UDP_SRC_PORT     = 0x0001000000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_UDP_DST_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_UDP_LENGTH       = 0x0000400000000000,
+	BNXT_ULP_HF2_7_BITMASK_O_UDP_CSUM         = 0x0000200000000000
 };
 
 enum bnxt_ulp_hf2_8_bitmask {
@@ -571,20 +586,23 @@ enum bnxt_ulp_hf2_8_bitmask {
 	BNXT_ULP_HF2_8_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
 	BNXT_ULP_HF2_8_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
 	BNXT_ULP_HF2_8_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_VER         = 0x0080000000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_UDP_SRC_PORT     = 0x0000200000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_UDP_DST_PORT     = 0x0000100000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_UDP_LENGTH       = 0x0000080000000000,
-	BNXT_ULP_HF2_8_BITMASK_O_UDP_CSUM         = 0x0000040000000000
+	BNXT_ULP_HF2_8_BITMASK_O_IPV6_VER         = 0x0080000000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_IPV6_TC          = 0x0040000000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_TCP_SRC_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_TCP_DST_PORT     = 0x0000400000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_TCP_SENT_SEQ     = 0x0000200000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_TCP_RECV_ACK     = 0x0000100000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_TCP_DATA_OFF     = 0x0000080000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_TCP_TCP_FLAGS    = 0x0000040000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_TCP_RX_WIN       = 0x0000020000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_TCP_CSUM         = 0x0000010000000000,
+	BNXT_ULP_HF2_8_BITMASK_O_TCP_URP          = 0x0000008000000000
 };
 
 enum bnxt_ulp_hf2_9_bitmask {
@@ -596,14 +614,25 @@ enum bnxt_ulp_hf2_9_bitmask {
 	BNXT_ULP_HF2_9_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
 	BNXT_ULP_HF2_9_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
 	BNXT_ULP_HF2_9_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF2_9_BITMASK_O_IPV6_VER         = 0x0080000000000000,
-	BNXT_ULP_HF2_9_BITMASK_O_IPV6_TC          = 0x0040000000000000,
-	BNXT_ULP_HF2_9_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
-	BNXT_ULP_HF2_9_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
-	BNXT_ULP_HF2_9_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
-	BNXT_ULP_HF2_9_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF2_9_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
-	BNXT_ULP_HF2_9_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_VER         = 0x0080000000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_TCP_SRC_PORT     = 0x0000200000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_TCP_DST_PORT     = 0x0000100000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_TCP_SENT_SEQ     = 0x0000080000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_TCP_RECV_ACK     = 0x0000040000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_TCP_DATA_OFF     = 0x0000020000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_TCP_TCP_FLAGS    = 0x0000010000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_TCP_RX_WIN       = 0x0000008000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_TCP_CSUM         = 0x0000004000000000,
+	BNXT_ULP_HF2_9_BITMASK_O_TCP_URP          = 0x0000002000000000
 };
 
 enum bnxt_ulp_hf2_10_bitmask {
@@ -623,15 +652,10 @@ enum bnxt_ulp_hf2_10_bitmask {
 	BNXT_ULP_HF2_10_BITMASK_O_IPV6_TTL        = 0x0004000000000000,
 	BNXT_ULP_HF2_10_BITMASK_O_IPV6_SRC_ADDR   = 0x0002000000000000,
 	BNXT_ULP_HF2_10_BITMASK_O_IPV6_DST_ADDR   = 0x0001000000000000,
-	BNXT_ULP_HF2_10_BITMASK_O_TCP_SRC_PORT    = 0x0000800000000000,
-	BNXT_ULP_HF2_10_BITMASK_O_TCP_DST_PORT    = 0x0000400000000000,
-	BNXT_ULP_HF2_10_BITMASK_O_TCP_SENT_SEQ    = 0x0000200000000000,
-	BNXT_ULP_HF2_10_BITMASK_O_TCP_RECV_ACK    = 0x0000100000000000,
-	BNXT_ULP_HF2_10_BITMASK_O_TCP_DATA_OFF    = 0x0000080000000000,
-	BNXT_ULP_HF2_10_BITMASK_O_TCP_TCP_FLAGS   = 0x0000040000000000,
-	BNXT_ULP_HF2_10_BITMASK_O_TCP_RX_WIN      = 0x0000020000000000,
-	BNXT_ULP_HF2_10_BITMASK_O_TCP_CSUM        = 0x0000010000000000,
-	BNXT_ULP_HF2_10_BITMASK_O_TCP_URP         = 0x0000008000000000
+	BNXT_ULP_HF2_10_BITMASK_O_UDP_SRC_PORT    = 0x0000800000000000,
+	BNXT_ULP_HF2_10_BITMASK_O_UDP_DST_PORT    = 0x0000400000000000,
+	BNXT_ULP_HF2_10_BITMASK_O_UDP_LENGTH      = 0x0000200000000000,
+	BNXT_ULP_HF2_10_BITMASK_O_UDP_CSUM        = 0x0000100000000000
 };
 
 enum bnxt_ulp_hf2_11_bitmask {
@@ -643,17 +667,20 @@ enum bnxt_ulp_hf2_11_bitmask {
 	BNXT_ULP_HF2_11_BITMASK_OO_VLAN_CFI_PRI   = 0x0400000000000000,
 	BNXT_ULP_HF2_11_BITMASK_OO_VLAN_VID       = 0x0200000000000000,
 	BNXT_ULP_HF2_11_BITMASK_OO_VLAN_TYPE      = 0x0100000000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_IPV6_VER        = 0x0080000000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_IPV6_TC         = 0x0040000000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_IPV6_FLOW_LABEL = 0x0020000000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_IPV6_PROTO_ID   = 0x0008000000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_IPV6_TTL        = 0x0004000000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_IPV6_SRC_ADDR   = 0x0002000000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_IPV6_DST_ADDR   = 0x0001000000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT    = 0x0000800000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT    = 0x0000400000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_UDP_LENGTH      = 0x0000200000000000,
-	BNXT_ULP_HF2_11_BITMASK_O_UDP_CSUM        = 0x0000100000000000
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_VER        = 0x0080000000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_TOS        = 0x0040000000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_LEN        = 0x0020000000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_FRAG_ID    = 0x0010000000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_FRAG_OFF   = 0x0008000000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_TTL        = 0x0004000000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_PROTO_ID   = 0x0002000000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_CSUM       = 0x0001000000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_SRC_ADDR   = 0x0000800000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_IPV4_DST_ADDR   = 0x0000400000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_UDP_SRC_PORT    = 0x0000200000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_UDP_DST_PORT    = 0x0000100000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_UDP_LENGTH      = 0x0000080000000000,
+	BNXT_ULP_HF2_11_BITMASK_O_UDP_CSUM        = 0x0000040000000000
 };
+
 #endif
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c
deleted file mode 100644
index 08f0e25b47..0000000000
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c
+++ /dev/null
@@ -1,709 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
- * All rights reserved.
- */
-
-/* date: Tue Dec  1 17:07:12 2020 */
-
-#include "ulp_template_db_enum.h"
-#include "ulp_template_db_field.h"
-#include "ulp_template_struct.h"
-#include "ulp_template_db_tbl.h"
-
-/* Mapper templates for header act list */
-struct bnxt_ulp_mapper_tmpl_info ulp_stingray_act_tmpl_list[] = {
-	/* act_tid: 1, stingray, ingress */
-	[1] = {
-	.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,
-	.num_tbls = 4,
-	.start_tbl_idx = 0,
-	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 0,
-		.cond_nums = 0 }
-	}
-};
-
-struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {
-	{ /* act_tid: 1, stingray, 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_RX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 0,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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,
-	.encap_num_fields = 0
-	},
-	{ /* act_tid: 1, stingray, 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_RX,
-	.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 1,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 1,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 12
-	},
-	{ /* act_tid: 1, stingray, 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,
-	.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 2,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 13,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
-	},
-	{ /* act_tid: 1, stingray, 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_RX,
-	.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT,
-	.execute_info = {
-		.cond_true_goto = 0,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 2,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 39,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
-	}
-};
-
-struct bnxt_ulp_mapper_cond_info ulp_stingray_act_cond_list[] = {
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
-	},
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
-	}
-};
-
-struct bnxt_ulp_mapper_field_info ulp_stingray_act_result_field_list[] = {
-	/* act_tid: 1, stingray, table: int_flow_counter_tbl.0 */
-	{
-	.description = "count",
-	.field_bit_size = 64,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* act_tid: 1, stingray, table: int_vtag_encap_record.0 */
-	{
-	.description = "ecv_tun_type",
-	.field_bit_size = 3,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "ecv_l4_type",
-	.field_bit_size = 3,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "ecv_l3_type",
-	.field_bit_size = 3,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "ecv_l2_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "ecv_vtag_type",
-	.field_bit_size = 4,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		ULP_SR_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
-	},
-	{
-	.description = "ecv_custom_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "ecv_valid",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
-	},
-	{
-	.description = "vtag_tpid",
-	.field_bit_size = 16,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_vid",
-	.field_bit_size = 12,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
-	},
-	{
-	.description = "vtag_de",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "spare",
-	.field_bit_size = 80,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* act_tid: 1, stingray, table: int_full_act_record.0 */
-	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "agg_cntr_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "rate_cntr_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "flow_cntr_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_mir",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_match",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_ACT_BIT,
-	.field_cond_opr = {
-		((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_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST
-	},
-	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_ACT_BIT,
-	.field_cond_opr = {
-		((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_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST
-	},
-	{
-	.description = "meter_id",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l3_rdir",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tl3_rdir",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l3_ttl_dec",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_ACT_BIT,
-	.field_cond_opr = {
-		((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_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		ULP_SR_SYM_DECAP_FUNC_THRU_TUN},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-		ULP_SR_SYM_DECAP_FUNC_NONE}
-	},
-	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "mirror",
-	.field_bit_size = 2,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "drop",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "type",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* act_tid: 1, stingray, table: ext_full_act_record.0 */
-	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "agg_cntr_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "rate_cntr_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "flow_cntr_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_mir",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_match",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "encap_rec_int",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_ACT_BIT,
-	.field_cond_opr = {
-		((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_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST
-	},
-	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_ACT_BIT,
-	.field_cond_opr = {
-		((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_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST
-	},
-	{
-	.description = "meter_id",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l3_rdir",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tl3_rdir",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l3_ttl_dec",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_ACT_BIT,
-	.field_cond_opr = {
-		((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_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		ULP_SR_SYM_DECAP_FUNC_THRU_TUN},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-		ULP_SR_SYM_DECAP_FUNC_NONE}
-	},
-	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "mirror",
-	.field_bit_size = 2,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "drop",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
-	}
-};
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c
index fd4ceb226c..e9799d0b90 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-/* date: Fri Jan 29 11:27:48 2021 */
+/* date: Thu Mar  4 10:12:06 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -91,34 +91,26 @@ struct bnxt_ulp_generic_tbl_params ulp_generic_tbl_params[] = {
 	.num_buckets             = 8,
 	.hash_tbl_entries        = 1024,
 	.result_byte_order       = BNXT_ULP_BYTE_ORDER_LE
-	}
-};
-
-/* device tables */
-const struct bnxt_ulp_template_device_tbls ulp_template_stingray_tbls[] = {
-	[BNXT_ULP_TEMPLATE_TYPE_CLASS] = {
-	.tmpl_list               = ulp_stingray_class_tmpl_list,
-	.tmpl_list_size          = ULP_STINGRAY_CLASS_TMPL_LIST_SIZE,
-	.tbl_list                = ulp_stingray_class_tbl_list,
-	.tbl_list_size           = ULP_STINGRAY_CLASS_TBL_LIST_SIZE,
-	.key_info_list           = ulp_stingray_class_key_info_list,
-	.key_info_list_size      = ULP_STINGRAY_CLASS_KEY_INFO_LIST_SIZE,
-	.ident_list              = ulp_stingray_class_ident_list,
-	.ident_list_size         = ULP_STINGRAY_CLASS_IDENT_LIST_SIZE,
-	.cond_list               = ulp_stingray_class_cond_list,
-	.cond_list_size          = ULP_STINGRAY_CLASS_COND_LIST_SIZE,
-	.result_field_list       = ulp_stingray_class_result_field_list,
-	.result_field_list_size  = ULP_STINGRAY_CLASS_RESULT_FIELD_LIST_SIZE
 	},
-	[BNXT_ULP_TEMPLATE_TYPE_ACTION] = {
-	.tmpl_list               = ulp_stingray_act_tmpl_list,
-	.tmpl_list_size          = ULP_STINGRAY_ACT_TMPL_LIST_SIZE,
-	.tbl_list                = ulp_stingray_act_tbl_list,
-	.tbl_list_size           = ULP_STINGRAY_ACT_TBL_LIST_SIZE,
-	.cond_list               = ulp_stingray_act_cond_list,
-	.cond_list_size          = ULP_STINGRAY_ACT_COND_LIST_SIZE,
-	.result_field_list       = ulp_stingray_act_result_field_list,
-	.result_field_list_size  = ULP_STINGRAY_ACT_RESULT_FIELD_LIST_SIZE
+	[BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE << 1 |
+		BNXT_ULP_DIRECTION_INGRESS] = {
+	.name                    = "INGRESS GENERIC_TABLE_PORT_TABLE",
+	.result_num_entries      = 1024,
+	.result_num_bytes        = 18,
+	.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_PORT_TABLE << 1 |
+		BNXT_ULP_DIRECTION_EGRESS] = {
+	.name                    = "EGRESS GENERIC_TABLE_PORT_TABLE",
+	.result_num_entries      = 1024,
+	.result_num_bytes        = 18,
+	.key_num_bytes           = 0,
+	.num_buckets             = 0,
+	.hash_tbl_entries        = 0,
+	.result_byte_order       = BNXT_ULP_BYTE_ORDER_LE
 	}
 };
 
@@ -154,6 +146,32 @@ const struct bnxt_ulp_template_device_tbls ulp_template_wh_plus_tbls[] = {
 	}
 };
 
+/* device tables */
+const struct bnxt_ulp_template_device_tbls ulp_template_thor_tbls[] = {
+	[BNXT_ULP_TEMPLATE_TYPE_CLASS] = {
+	.tmpl_list               = ulp_thor_class_tmpl_list,
+	.tmpl_list_size          = ULP_THOR_CLASS_TMPL_LIST_SIZE,
+	.tbl_list                = ulp_thor_class_tbl_list,
+	.tbl_list_size           = ULP_THOR_CLASS_TBL_LIST_SIZE,
+	.key_info_list           = ulp_thor_class_key_info_list,
+	.key_info_list_size      = ULP_THOR_CLASS_KEY_INFO_LIST_SIZE,
+	.ident_list              = ulp_thor_class_ident_list,
+	.ident_list_size         = ULP_THOR_CLASS_IDENT_LIST_SIZE,
+	.cond_list               = ulp_thor_class_cond_list,
+	.cond_list_size          = ULP_THOR_CLASS_COND_LIST_SIZE,
+	.result_field_list       = ulp_thor_class_result_field_list,
+	.result_field_list_size  = ULP_THOR_CLASS_RESULT_FIELD_LIST_SIZE
+	},
+	[BNXT_ULP_TEMPLATE_TYPE_ACTION] = {
+	.tmpl_list               = ulp_thor_act_tmpl_list,
+	.tmpl_list_size          = ULP_THOR_ACT_TMPL_LIST_SIZE,
+	.tbl_list                = ulp_thor_act_tbl_list,
+	.tbl_list_size           = ULP_THOR_ACT_TBL_LIST_SIZE,
+	.result_field_list       = ulp_thor_act_result_field_list,
+	.result_field_list_size  = ULP_THOR_ACT_RESULT_FIELD_LIST_SIZE
+	}
+};
+
 /* List of device specific parameters */
 struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
 	[BNXT_ULP_DEVICE_ID_WH_PLUS] = {
@@ -173,17 +191,18 @@ struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
 	.packet_count_mask       = 0xffffffff00000000,
 	.byte_count_shift        = 0,
 	.packet_count_shift      = 36,
+	.dynamic_pad_en          = 0,
 	.dev_tbls                = ulp_template_wh_plus_tbls
 	},
-	[BNXT_ULP_DEVICE_ID_STINGRAY] = {
-	.description             = "Stingray",
+	[BNXT_ULP_DEVICE_ID_THOR] = {
+	.description             = "Thor",
 	.byte_order              = BNXT_ULP_BYTE_ORDER_LE,
 	.encap_byte_swap         = 1,
 	.int_flow_db_num_entries = 16384,
 	.ext_flow_db_num_entries = 32768,
-	.mark_db_lfid_entries    = 65536,
-	.mark_db_gfid_entries    = 65536,
-	.flow_count_db_entries   = 16384,
+	.mark_db_lfid_entries    = 0,
+	.mark_db_gfid_entries    = 0,
+	.flow_count_db_entries   = 0,
 	.fdb_parent_flow_entries = 2,
 	.num_resources_per_flow  = 8,
 	.num_phy_ports           = 2,
@@ -192,7 +211,16 @@ struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
 	.packet_count_mask       = 0xffffffff00000000,
 	.byte_count_shift        = 0,
 	.packet_count_shift      = 36,
-	.dev_tbls                = ulp_template_stingray_tbls
+	.dynamic_pad_en          = 1,
+	.em_blk_size_bits        = 100,
+	.em_blk_align_bits       = 128,
+	.em_key_align_bytes      = 80,
+	.wc_slice_width          = 160,
+	.wc_max_slices           = 4,
+	.wc_mode_list       = {0x0000000c, 0x0000000e, 0x0000000f, 0x0000000f},
+	.wc_mod_list_max_size    = 4,
+	.wc_ctl_size_bits        = 32,
+	.dev_tbls                = ulp_template_thor_tbls
 	}
 };
 
@@ -248,11 +276,6 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {
 	}
 };
 
-/* Lists global action records */
-uint32_t ulp_glb_template_tbl[] = {
-	BNXT_ULP_DF_TPL_LOOPBACK_ACTION_REC
-};
-
 /* Provides act_bitmask */
 struct bnxt_ulp_shared_act_info ulp_shared_act_info[] = {
 	[BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SHARED_MIRROR << 1 |
@@ -360,85 +383,76 @@ uint8_t ulp_glb_field_tbl[] = {
 	[2050] = 2,
 	[2052] = 3,
 	[2054] = 4,
-	[2058] = 5,
-	[2060] = 6,
-	[2062] = 7,
-	[2064] = 8,
-	[2066] = 9,
-	[2068] = 10,
-	[2070] = 11,
-	[2072] = 12,
-	[2074] = 13,
-	[2076] = 14,
+	[2088] = 5,
+	[2090] = 6,
+	[2092] = 7,
+	[2094] = 8,
+	[2096] = 9,
+	[2098] = 10,
+	[2100] = 11,
+	[2102] = 12,
 	[2176] = 0,
 	[2177] = 1,
 	[2178] = 2,
 	[2180] = 3,
 	[2182] = 4,
-	[2186] = 5,
-	[2188] = 6,
-	[2190] = 7,
-	[2192] = 8,
-	[2194] = 9,
-	[2196] = 10,
-	[2198] = 11,
-	[2200] = 12,
-	[2202] = 13,
-	[2204] = 14,
-	[2232] = 15,
-	[2234] = 16,
-	[2236] = 17,
-	[2238] = 18,
-	[2240] = 19,
-	[2242] = 20,
-	[2244] = 21,
-	[2246] = 22,
-	[2248] = 23,
+	[2196] = 5,
+	[2198] = 6,
+	[2200] = 7,
+	[2202] = 8,
+	[2204] = 9,
+	[2206] = 10,
+	[2208] = 11,
+	[2210] = 12,
+	[2212] = 13,
+	[2214] = 14,
 	[2304] = 0,
 	[2305] = 1,
 	[2306] = 2,
 	[2308] = 3,
 	[2310] = 4,
-	[2314] = 5,
-	[2316] = 6,
-	[2318] = 7,
-	[2320] = 8,
-	[2322] = 9,
-	[2324] = 10,
-	[2326] = 11,
-	[2328] = 12,
-	[2330] = 13,
-	[2332] = 14,
-	[2378] = 15,
-	[2380] = 16,
-	[2382] = 17,
-	[2384] = 18,
+	[2344] = 8,
+	[2346] = 9,
+	[2348] = 10,
+	[2350] = 11,
+	[2352] = 12,
+	[2354] = 13,
+	[2356] = 14,
+	[2358] = 15,
+	[2386] = 5,
+	[2390] = 6,
+	[2394] = 7,
 	[2432] = 0,
 	[2433] = 1,
 	[2434] = 2,
 	[2436] = 3,
 	[2438] = 4,
-	[2462] = 5,
-	[2464] = 6,
-	[2466] = 7,
-	[2468] = 8,
-	[2470] = 9,
-	[2472] = 10,
-	[2474] = 11,
-	[2476] = 12,
+	[2452] = 8,
+	[2454] = 9,
+	[2456] = 10,
+	[2458] = 11,
+	[2460] = 12,
+	[2462] = 13,
+	[2464] = 14,
+	[2466] = 15,
+	[2468] = 16,
+	[2470] = 17,
+	[2514] = 5,
+	[2518] = 6,
+	[2522] = 7,
 	[2560] = 0,
 	[2561] = 1,
 	[2562] = 2,
 	[2564] = 3,
 	[2566] = 4,
-	[2590] = 5,
-	[2592] = 6,
-	[2594] = 7,
-	[2596] = 8,
-	[2598] = 9,
-	[2600] = 10,
-	[2602] = 11,
-	[2604] = 12,
+	[2600] = 5,
+	[2602] = 6,
+	[2604] = 7,
+	[2606] = 8,
+	[2608] = 9,
+	[2610] = 10,
+	[2612] = 11,
+	[2614] = 12,
 	[2616] = 13,
 	[2618] = 14,
 	[2620] = 15,
@@ -453,82 +467,83 @@ uint8_t ulp_glb_field_tbl[] = {
 	[2690] = 2,
 	[2692] = 3,
 	[2694] = 4,
-	[2718] = 5,
-	[2720] = 6,
-	[2722] = 7,
-	[2724] = 8,
-	[2726] = 9,
-	[2728] = 10,
-	[2730] = 11,
-	[2732] = 12,
-	[2762] = 13,
-	[2764] = 14,
-	[2766] = 15,
-	[2768] = 16,
+	[2708] = 5,
+	[2710] = 6,
+	[2712] = 7,
+	[2714] = 8,
+	[2716] = 9,
+	[2718] = 10,
+	[2720] = 11,
+	[2722] = 12,
+	[2724] = 13,
+	[2726] = 14,
+	[2744] = 15,
+	[2746] = 16,
+	[2748] = 17,
+	[2750] = 18,
+	[2752] = 19,
+	[2754] = 20,
+	[2756] = 21,
+	[2758] = 22,
+	[2760] = 23,
 	[2816] = 0,
 	[2817] = 1,
 	[2818] = 2,
 	[2820] = 3,
 	[2822] = 4,
-	[2826] = 8,
-	[2828] = 9,
-	[2830] = 10,
-	[2832] = 11,
-	[2834] = 12,
-	[2836] = 13,
-	[2838] = 14,
-	[2840] = 15,
-	[2842] = 16,
-	[2844] = 17,
-	[2898] = 5,
-	[2902] = 6,
-	[2906] = 7,
+	[2856] = 5,
+	[2858] = 6,
+	[2860] = 7,
+	[2862] = 8,
+	[2864] = 9,
+	[2866] = 10,
+	[2868] = 11,
+	[2870] = 12,
+	[2890] = 13,
+	[2892] = 14,
+	[2894] = 15,
+	[2896] = 16,
 	[2944] = 0,
 	[2945] = 1,
 	[2946] = 2,
 	[2948] = 3,
 	[2950] = 4,
-	[2954] = 8,
-	[2956] = 9,
-	[2958] = 10,
-	[2960] = 11,
-	[2962] = 12,
-	[2964] = 13,
-	[2966] = 14,
-	[2968] = 15,
-	[2970] = 16,
-	[2972] = 17,
-	[3000] = 18,
-	[3002] = 19,
-	[3004] = 20,
-	[3006] = 21,
-	[3008] = 22,
-	[3010] = 23,
-	[3012] = 24,
-	[3014] = 25,
-	[3016] = 26,
-	[3026] = 5,
-	[3030] = 6,
-	[3034] = 7,
+	[2964] = 5,
+	[2966] = 6,
+	[2968] = 7,
+	[2970] = 8,
+	[2972] = 9,
+	[2974] = 10,
+	[2976] = 11,
+	[2978] = 12,
+	[2980] = 13,
+	[2982] = 14,
+	[3018] = 15,
+	[3020] = 16,
+	[3022] = 17,
+	[3024] = 18,
 	[3072] = 0,
 	[3073] = 1,
 	[3074] = 2,
 	[3076] = 3,
 	[3078] = 4,
-	[3082] = 8,
-	[3084] = 9,
-	[3086] = 10,
-	[3088] = 11,
-	[3090] = 12,
-	[3092] = 13,
-	[3094] = 14,
-	[3096] = 15,
-	[3098] = 16,
-	[3100] = 17,
-	[3146] = 18,
-	[3148] = 19,
-	[3150] = 20,
-	[3152] = 21,
+	[3112] = 8,
+	[3114] = 9,
+	[3116] = 10,
+	[3118] = 11,
+	[3120] = 12,
+	[3122] = 13,
+	[3124] = 14,
+	[3126] = 15,
+	[3128] = 16,
+	[3130] = 17,
+	[3132] = 18,
+	[3134] = 19,
+	[3136] = 20,
+	[3138] = 21,
+	[3140] = 22,
+	[3142] = 23,
+	[3144] = 24,
 	[3154] = 5,
 	[3158] = 6,
 	[3162] = 7,
@@ -537,14 +552,25 @@ uint8_t ulp_glb_field_tbl[] = {
 	[3202] = 2,
 	[3204] = 3,
 	[3206] = 4,
-	[3230] = 8,
-	[3232] = 9,
-	[3234] = 10,
-	[3236] = 11,
-	[3238] = 12,
-	[3240] = 13,
-	[3242] = 14,
-	[3244] = 15,
+	[3220] = 8,
+	[3222] = 9,
+	[3224] = 10,
+	[3226] = 11,
+	[3228] = 12,
+	[3230] = 13,
+	[3232] = 14,
+	[3234] = 15,
+	[3236] = 16,
+	[3238] = 17,
+	[3256] = 18,
+	[3258] = 19,
+	[3260] = 20,
+	[3262] = 21,
+	[3264] = 22,
+	[3266] = 23,
+	[3268] = 24,
+	[3270] = 25,
+	[3272] = 26,
 	[3282] = 5,
 	[3286] = 6,
 	[3290] = 7,
@@ -553,23 +579,18 @@ uint8_t ulp_glb_field_tbl[] = {
 	[3330] = 2,
 	[3332] = 3,
 	[3334] = 4,
-	[3358] = 8,
-	[3360] = 9,
-	[3362] = 10,
-	[3364] = 11,
-	[3366] = 12,
-	[3368] = 13,
-	[3370] = 14,
-	[3372] = 15,
-	[3384] = 16,
-	[3386] = 17,
-	[3388] = 18,
-	[3390] = 19,
-	[3392] = 20,
-	[3394] = 21,
-	[3396] = 22,
-	[3398] = 23,
-	[3400] = 24,
+	[3368] = 8,
+	[3370] = 9,
+	[3372] = 10,
+	[3374] = 11,
+	[3376] = 12,
+	[3378] = 13,
+	[3380] = 14,
+	[3382] = 15,
+	[3402] = 16,
+	[3404] = 17,
+	[3406] = 18,
+	[3408] = 19,
 	[3410] = 5,
 	[3414] = 6,
 	[3418] = 7,
@@ -578,105 +599,121 @@ uint8_t ulp_glb_field_tbl[] = {
 	[3458] = 2,
 	[3460] = 3,
 	[3462] = 4,
-	[3486] = 8,
-	[3488] = 9,
-	[3490] = 10,
-	[3492] = 11,
-	[3494] = 12,
-	[3496] = 13,
-	[3498] = 14,
-	[3500] = 15,
-	[3530] = 16,
-	[3532] = 17,
-	[3534] = 18,
-	[3536] = 19,
+	[3476] = 8,
+	[3478] = 9,
+	[3480] = 10,
+	[3482] = 11,
+	[3484] = 12,
+	[3486] = 13,
+	[3488] = 14,
+	[3490] = 15,
+	[3492] = 16,
+	[3494] = 17,
+	[3530] = 18,
+	[3532] = 19,
+	[3534] = 20,
+	[3536] = 21,
 	[3538] = 5,
 	[3542] = 6,
 	[3546] = 7,
+	[3584] = 0,
+	[3585] = 1,
+	[3586] = 2,
+	[3588] = 3,
+	[3590] = 4,
+	[3604] = 5,
+	[3606] = 6,
+	[3608] = 7,
+	[3610] = 8,
+	[3612] = 9,
+	[3614] = 10,
+	[3616] = 11,
+	[3618] = 12,
+	[3620] = 13,
+	[3622] = 14,
+	[3658] = 15,
+	[3660] = 16,
+	[3662] = 17,
+	[3664] = 18,
+	[3678] = 19,
+	[3679] = 20,
+	[3680] = 21,
+	[3681] = 22,
 	[4096] = 0,
 	[4097] = 1,
 	[4098] = 2,
 	[4100] = 3,
 	[4102] = 4,
-	[4106] = 5,
-	[4108] = 6,
-	[4110] = 7,
-	[4112] = 8,
-	[4114] = 9,
-	[4116] = 10,
-	[4118] = 11,
-	[4120] = 12,
-	[4122] = 13,
-	[4124] = 14,
+	[4136] = 5,
+	[4138] = 6,
+	[4140] = 7,
+	[4142] = 8,
+	[4144] = 9,
+	[4146] = 10,
+	[4148] = 11,
+	[4150] = 12,
 	[4224] = 0,
 	[4225] = 1,
 	[4226] = 2,
 	[4228] = 3,
 	[4230] = 4,
-	[4234] = 5,
-	[4236] = 6,
-	[4238] = 7,
-	[4240] = 8,
-	[4242] = 9,
-	[4244] = 10,
-	[4246] = 11,
-	[4248] = 12,
-	[4250] = 13,
-	[4252] = 14,
-	[4280] = 15,
-	[4282] = 16,
-	[4284] = 17,
-	[4286] = 18,
-	[4288] = 19,
-	[4290] = 20,
-	[4292] = 21,
-	[4294] = 22,
-	[4296] = 23,
+	[4244] = 5,
+	[4246] = 6,
+	[4248] = 7,
+	[4250] = 8,
+	[4252] = 9,
+	[4254] = 10,
+	[4256] = 11,
+	[4258] = 12,
+	[4260] = 13,
+	[4262] = 14,
 	[4352] = 0,
 	[4353] = 1,
 	[4354] = 2,
 	[4356] = 3,
 	[4358] = 4,
-	[4362] = 5,
-	[4364] = 6,
-	[4366] = 7,
-	[4368] = 8,
-	[4370] = 9,
-	[4372] = 10,
-	[4374] = 11,
-	[4376] = 12,
-	[4378] = 13,
-	[4380] = 14,
-	[4426] = 15,
-	[4428] = 16,
-	[4430] = 17,
-	[4432] = 18,
+	[4392] = 8,
+	[4394] = 9,
+	[4396] = 10,
+	[4398] = 11,
+	[4400] = 12,
+	[4402] = 13,
+	[4404] = 14,
+	[4406] = 15,
+	[4434] = 5,
+	[4438] = 6,
+	[4442] = 7,
 	[4480] = 0,
 	[4481] = 1,
 	[4482] = 2,
 	[4484] = 3,
 	[4486] = 4,
-	[4510] = 5,
-	[4512] = 6,
-	[4514] = 7,
-	[4516] = 8,
-	[4518] = 9,
-	[4520] = 10,
-	[4522] = 11,
-	[4524] = 12,
+	[4500] = 8,
+	[4502] = 9,
+	[4504] = 10,
+	[4506] = 11,
+	[4508] = 12,
+	[4510] = 13,
+	[4512] = 14,
+	[4514] = 15,
+	[4516] = 16,
+	[4518] = 17,
+	[4562] = 5,
+	[4566] = 6,
+	[4570] = 7,
 	[4608] = 0,
 	[4609] = 1,
 	[4610] = 2,
 	[4612] = 3,
 	[4614] = 4,
-	[4638] = 5,
-	[4640] = 6,
-	[4642] = 7,
-	[4644] = 8,
-	[4646] = 9,
-	[4648] = 10,
-	[4650] = 11,
-	[4652] = 12,
+	[4648] = 5,
+	[4650] = 6,
+	[4652] = 7,
+	[4654] = 8,
+	[4656] = 9,
+	[4658] = 10,
+	[4660] = 11,
+	[4662] = 12,
 	[4664] = 13,
 	[4666] = 14,
 	[4668] = 15,
@@ -691,82 +728,83 @@ uint8_t ulp_glb_field_tbl[] = {
 	[4738] = 2,
 	[4740] = 3,
 	[4742] = 4,
-	[4766] = 5,
-	[4768] = 6,
-	[4770] = 7,
-	[4772] = 8,
-	[4774] = 9,
-	[4776] = 10,
-	[4778] = 11,
-	[4780] = 12,
-	[4810] = 13,
-	[4812] = 14,
-	[4814] = 15,
-	[4816] = 16,
+	[4756] = 5,
+	[4758] = 6,
+	[4760] = 7,
+	[4762] = 8,
+	[4764] = 9,
+	[4766] = 10,
+	[4768] = 11,
+	[4770] = 12,
+	[4772] = 13,
+	[4774] = 14,
+	[4792] = 15,
+	[4794] = 16,
+	[4796] = 17,
+	[4798] = 18,
+	[4800] = 19,
+	[4802] = 20,
+	[4804] = 21,
+	[4806] = 22,
+	[4808] = 23,
 	[4864] = 0,
 	[4865] = 1,
 	[4866] = 2,
 	[4868] = 3,
 	[4870] = 4,
-	[4874] = 8,
-	[4876] = 9,
-	[4878] = 10,
-	[4880] = 11,
-	[4882] = 12,
-	[4884] = 13,
-	[4886] = 14,
-	[4888] = 15,
-	[4890] = 16,
-	[4892] = 17,
-	[4946] = 5,
-	[4950] = 6,
-	[4954] = 7,
+	[4904] = 5,
+	[4906] = 6,
+	[4908] = 7,
+	[4910] = 8,
+	[4912] = 9,
+	[4914] = 10,
+	[4916] = 11,
+	[4918] = 12,
+	[4938] = 13,
+	[4940] = 14,
+	[4942] = 15,
+	[4944] = 16,
 	[4992] = 0,
 	[4993] = 1,
 	[4994] = 2,
 	[4996] = 3,
 	[4998] = 4,
-	[5002] = 8,
-	[5004] = 9,
-	[5006] = 10,
-	[5008] = 11,
-	[5010] = 12,
-	[5012] = 13,
-	[5014] = 14,
-	[5016] = 15,
-	[5018] = 16,
-	[5020] = 17,
-	[5048] = 18,
-	[5050] = 19,
-	[5052] = 20,
-	[5054] = 21,
-	[5056] = 22,
-	[5058] = 23,
-	[5060] = 24,
-	[5062] = 25,
-	[5064] = 26,
-	[5074] = 5,
-	[5078] = 6,
-	[5082] = 7,
+	[5012] = 5,
+	[5014] = 6,
+	[5016] = 7,
+	[5018] = 8,
+	[5020] = 9,
+	[5022] = 10,
+	[5024] = 11,
+	[5026] = 12,
+	[5028] = 13,
+	[5030] = 14,
+	[5066] = 15,
+	[5068] = 16,
+	[5070] = 17,
+	[5072] = 18,
 	[5120] = 0,
 	[5121] = 1,
 	[5122] = 2,
 	[5124] = 3,
 	[5126] = 4,
-	[5130] = 8,
-	[5132] = 9,
-	[5134] = 10,
-	[5136] = 11,
-	[5138] = 12,
-	[5140] = 13,
-	[5142] = 14,
-	[5144] = 15,
-	[5146] = 16,
-	[5148] = 17,
-	[5194] = 18,
-	[5196] = 19,
-	[5198] = 20,
-	[5200] = 21,
+	[5160] = 8,
+	[5162] = 9,
+	[5164] = 10,
+	[5166] = 11,
+	[5168] = 12,
+	[5170] = 13,
+	[5172] = 14,
+	[5174] = 15,
+	[5176] = 16,
+	[5178] = 17,
+	[5180] = 18,
+	[5182] = 19,
+	[5184] = 20,
+	[5186] = 21,
+	[5188] = 22,
+	[5190] = 23,
+	[5192] = 24,
 	[5202] = 5,
 	[5206] = 6,
 	[5210] = 7,
@@ -775,14 +813,25 @@ uint8_t ulp_glb_field_tbl[] = {
 	[5250] = 2,
 	[5252] = 3,
 	[5254] = 4,
-	[5278] = 8,
-	[5280] = 9,
-	[5282] = 10,
-	[5284] = 11,
-	[5286] = 12,
-	[5288] = 13,
-	[5290] = 14,
-	[5292] = 15,
+	[5268] = 8,
+	[5270] = 9,
+	[5272] = 10,
+	[5274] = 11,
+	[5276] = 12,
+	[5278] = 13,
+	[5280] = 14,
+	[5282] = 15,
+	[5284] = 16,
+	[5286] = 17,
+	[5304] = 18,
+	[5306] = 19,
+	[5308] = 20,
+	[5310] = 21,
+	[5312] = 22,
+	[5314] = 23,
+	[5316] = 24,
+	[5318] = 25,
+	[5320] = 26,
 	[5330] = 5,
 	[5334] = 6,
 	[5338] = 7,
@@ -791,23 +840,18 @@ uint8_t ulp_glb_field_tbl[] = {
 	[5378] = 2,
 	[5380] = 3,
 	[5382] = 4,
-	[5406] = 8,
-	[5408] = 9,
-	[5410] = 10,
-	[5412] = 11,
-	[5414] = 12,
-	[5416] = 13,
-	[5418] = 14,
-	[5420] = 15,
-	[5432] = 16,
-	[5434] = 17,
-	[5436] = 18,
-	[5438] = 19,
-	[5440] = 20,
-	[5442] = 21,
-	[5444] = 22,
-	[5446] = 23,
-	[5448] = 24,
+	[5416] = 8,
+	[5418] = 9,
+	[5420] = 10,
+	[5422] = 11,
+	[5424] = 12,
+	[5426] = 13,
+	[5428] = 14,
+	[5430] = 15,
+	[5450] = 16,
+	[5452] = 17,
+	[5454] = 18,
+	[5456] = 19,
 	[5458] = 5,
 	[5462] = 6,
 	[5466] = 7,
@@ -816,18 +860,20 @@ uint8_t ulp_glb_field_tbl[] = {
 	[5506] = 2,
 	[5508] = 3,
 	[5510] = 4,
-	[5534] = 8,
-	[5536] = 9,
-	[5538] = 10,
-	[5540] = 11,
-	[5542] = 12,
-	[5544] = 13,
-	[5546] = 14,
-	[5548] = 15,
-	[5578] = 16,
-	[5580] = 17,
-	[5582] = 18,
-	[5584] = 19,
+	[5524] = 8,
+	[5526] = 9,
+	[5528] = 10,
+	[5530] = 11,
+	[5532] = 12,
+	[5534] = 13,
+	[5536] = 14,
+	[5538] = 15,
+	[5540] = 16,
+	[5542] = 17,
+	[5578] = 18,
+	[5580] = 19,
+	[5582] = 20,
+	[5584] = 21,
 	[5586] = 5,
 	[5590] = 6,
 	[5594] = 7
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h
index 07f9075de7..328520c319 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -57,6 +57,10 @@ extern struct bnxt_ulp_mapper_tmpl_info ulp_stingray_act_tmpl_list[];
 
 extern struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[];
 
+extern struct bnxt_ulp_mapper_key_info ulp_stingray_act_key_info_list[];
+
+extern struct bnxt_ulp_mapper_ident_info ulp_stingray_act_ident_list[];
+
 extern struct
 bnxt_ulp_mapper_field_info ulp_stingray_act_result_field_list[];
 
@@ -66,5 +70,43 @@ bnxt_ulp_mapper_cond_info ulp_stingray_class_cond_list[];
 extern struct
 bnxt_ulp_mapper_cond_info ulp_stingray_act_cond_list[];
 
+/* Thor template table declarations */
+extern struct bnxt_ulp_mapper_tmpl_info ulp_thor_class_tmpl_list[];
+
+extern struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[];
+
+extern struct
+bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[];
+
+extern struct
+bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[];
+
+extern struct bnxt_ulp_mapper_ident_info ulp_thor_class_ident_list[];
+
+extern struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[];
+
+extern struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[];
+
+extern struct bnxt_ulp_mapper_key_info ulp_thor_act_key_info_list[];
+
+extern struct bnxt_ulp_mapper_ident_info ulp_thor_act_ident_list[];
+
+extern struct
+bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[];
+
+extern struct
+bnxt_ulp_mapper_cond_info ulp_thor_class_cond_list[];
+
+extern struct
+bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[];
+
+extern struct bnxt_ulp_mapper_key_info ulp_wh_plus_act_key_info_list[];
+
+extern struct bnxt_ulp_mapper_ident_info ulp_wh_plus_act_ident_list[];
+
+/* Global declarations */
 extern uint8_t ulp_glb_field_tbl[];
+
+extern struct
+bnxt_ulp_shared_act_info ulp_shared_act_info[];
 #endif
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_thor_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_thor_act.c
new file mode 100644
index 0000000000..d0d96f32d4
--- /dev/null
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_thor_act.c
@@ -0,0 +1,229 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2014-2021 Broadcom
+ * All rights reserved.
+ */
+
+/* date: Mon Feb  8 09:17:37 2021 */
+
+#include "ulp_template_db_enum.h"
+#include "ulp_template_db_field.h"
+#include "ulp_template_struct.h"
+#include "ulp_template_db_tbl.h"
+
+/* Mapper templates for header act list */
+struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[] = {
+	/* act_tid: 1, thor, ingress */
+	[1] = {
+	.device_name = BNXT_ULP_DEVICE_ID_THOR,
+	.num_tbls = 2,
+	.start_tbl_idx = 0,
+	.reject_info = {
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
+		.cond_start_idx = 0,
+		.cond_nums = 0 }
+	}
+};
+
+struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
+	{ /* act_tid: 1, thor, 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_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
+		.cond_start_idx = 0,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
+	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 0,
+	.result_bit_size = 64,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 1, thor, 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,
+	.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 1,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 1,
+	.result_bit_size = 128,
+	.result_num_fields = 17,
+	.encap_num_fields = 0
+	}
+};
+
+struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
+	/* 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
+	}
+};
+
+struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {
+	/* act_tid: 1, thor, table: int_flow_counter_tbl.0 */
+	{
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 1, thor, table: int_full_act_record.0 */
+	{
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mod_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rsvd1",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rsvd0",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 5,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "stats_op",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "stats_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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 = "vnic_or_vport",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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 = "use_default",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "cnd_copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vlan_dlt_rpt",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
+	}
+};
+
+struct
+bnxt_ulp_mapper_ident_info ulp_thor_act_ident_list[] = {
+};
+
+struct
+bnxt_ulp_mapper_key_info ulp_thor_act_key_info_list[] = {
+};
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_thor_class.c
similarity index 55%
rename from drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c
rename to drivers/net/bnxt/tf_ulp/ulp_template_db_thor_class.c
index c2cb452770..4d3d1e24b4 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_thor_class.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-/* date: Wed Dec  2 12:05:11 2020 */
+/* date: Fri Feb 12 13:05:14 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -11,1159 +11,685 @@
 #include "ulp_template_db_tbl.h"
 
 /* Mapper templates for header class list */
-struct bnxt_ulp_mapper_tmpl_info ulp_stingray_class_tmpl_list[] = {
-	/* class_tid: 1, stingray, ingress */
+struct bnxt_ulp_mapper_tmpl_info ulp_thor_class_tmpl_list[] = {
+	/* class_tid: 1, thor, ingress */
 	[1] = {
-	.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,
-	.num_tbls = 9,
+	.device_name = BNXT_ULP_DEVICE_ID_THOR,
+	.num_tbls = 11,
 	.start_tbl_idx = 0,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
 		.cond_start_idx = 0,
 		.cond_nums = 0 }
 	},
-	/* class_tid: 2, stingray, ingress */
+	/* class_tid: 2, thor, ingress */
 	[2] = {
-	.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,
-	.num_tbls = 6,
-	.start_tbl_idx = 9,
-	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 4,
-		.cond_nums = 0 }
-	},
-	/* class_tid: 3, stingray, egress */
-	[3] = {
-	.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,
-	.num_tbls = 8,
-	.start_tbl_idx = 15,
-	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 4,
-		.cond_nums = 0 }
-	},
-	/* class_tid: 4, stingray, egress */
-	[4] = {
-	.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,
-	.num_tbls = 7,
-	.start_tbl_idx = 23,
-	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 }
-	},
-	/* class_tid: 5, stingray, egress */
-	[5] = {
-	.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,
-	.num_tbls = 7,
-	.start_tbl_idx = 30,
-	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 }
-	},
-	/* class_tid: 6, stingray, egress */
-	[6] = {
-	.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,
+	.device_name = BNXT_ULP_DEVICE_ID_THOR,
 	.num_tbls = 1,
-	.start_tbl_idx = 37,
+	.start_tbl_idx = 11,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 10,
+		.cond_start_idx = 2,
 		.cond_nums = 0 }
 	}
 };
 
-struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {
-	{ /* class_tid: 1, stingray, table: l2_cntxt_tcam_cache.rd */
+struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
+	{ /* class_tid: 1, thor, table: mac_addr_cache.rd */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto = 2,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
 		.cond_start_idx = 0,
-		.cond_nums = 1 },
+		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 0,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
-	.ident_start_idx = 0,
-	.ident_nums = 1
+	.blob_key_bit_size = 56,
+	.key_bit_size = 56,
+	.key_num_fields = 2,
+	.result_start_idx = 0,
+	.result_bit_size = 62,
+	.result_num_fields = 4
+	},
+	{ /* class_tid: 1, thor, table: control.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 3,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
+		.cond_start_idx = 0,
+		.cond_nums = 1 },
+	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
-	{ /* class_tid: 1, stingray, table: l2_cntxt_tcam.0 */
+	{ /* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto = 1,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
 		.cond_start_idx = 1,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_SRCH_ALLOC_WR_REGFILE,
+	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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,
-	.key_start_idx = 1,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 0,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.encap_num_fields = 0,
-	.ident_start_idx = 1,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 2,
+	.blob_key_bit_size = 213,
+	.key_bit_size = 213,
+	.key_num_fields = 21,
+	.result_start_idx = 4,
+	.result_bit_size = 43,
+	.result_num_fields = 6,
+	.ident_start_idx = 0,
 	.ident_nums = 1
 	},
-	{ /* class_tid: 1, stingray, table: profile_tcam_cache.rd */
+	{ /* class_tid: 1, thor, table: mac_addr_cache.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_PROFILE_TCAM,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto = 1,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
 		.cond_start_idx = 1,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_FLOW_SIG_ID_MATCH,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 14,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
-	.key_num_fields = 3,
-	.ident_start_idx = 2,
-	.ident_nums = 3
-	},
-	{ /* class_tid: 1, stingray, table: branch.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto = 3,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 1,
-		.cond_nums = 1 },
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID
-	},
-	{ /* class_tid: 1, stingray, table: profile_tcam.0 */
-	.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_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 2,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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,
-	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-	.key_start_idx = 17,
-	.blob_key_bit_size = 81,
-	.key_bit_size = 81,
-	.key_num_fields = 43,
-	.result_start_idx = 13,
-	.result_bit_size = 38,
-	.result_num_fields = 8,
-	.encap_num_fields = 0,
-	.ident_start_idx = 5,
-	.ident_nums = 1
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 23,
+	.blob_key_bit_size = 56,
+	.key_bit_size = 56,
+	.key_num_fields = 2,
+	.result_start_idx = 10,
+	.result_bit_size = 62,
+	.result_num_fields = 4
 	},
-	{ /* class_tid: 1, stingray, table: profile_tcam_cache.wr */
+	{ /* class_tid: 1, thor, table: profile_tcam_cache.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_PROFILE_TCAM,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto = 1,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 2,
+		.cond_start_idx = 1,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 60,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 25,
 	.blob_key_bit_size = 14,
 	.key_bit_size = 14,
 	.key_num_fields = 3,
-	.result_start_idx = 21,
-	.result_bit_size = 66,
-	.result_num_fields = 5,
-	.encap_num_fields = 0
+	.ident_start_idx = 1,
+	.ident_nums = 5
 	},
-	{ /* class_tid: 1, stingray, table: em.int_0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type = TF_MEM_INTERNAL,
-	.direction = TF_DIR_RX,
-	.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 2,
-		.cond_nums = 1 },
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
-	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 63,
-	.blob_key_bit_size = 176,
-	.key_bit_size = 176,
-	.key_num_fields = 10,
-	.result_start_idx = 26,
-	.result_bit_size = 64,
-	.result_num_fields = 9,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 1, stingray, table: eem.ext_0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type = TF_MEM_EXTERNAL,
+	{ /* class_tid: 1, thor, table: control.1 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
 	.direction = TF_DIR_RX,
-	.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_EXT,
 	.execute_info = {
-		.cond_true_goto = 1,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 5,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 3,
+		.cond_start_idx = 1,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
-	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 73,
-	.blob_key_bit_size = 448,
-	.key_bit_size = 448,
-	.key_num_fields = 10,
-	.result_start_idx = 35,
-	.result_bit_size = 64,
-	.result_num_fields = 9,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 1, stingray, table: last */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
+	},
+	{ /* class_tid: 1, thor, table: fkb_select.wm */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_WC_FKB,
 	.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_TRUE,
-		.cond_start_idx = 4,
+		.cond_start_idx = 2,
 		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_WC_KEY_ID_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 14,
+	.result_bit_size = 106,
+	.result_num_fields = 106
 	},
-	{ /* class_tid: 2, stingray, table: int_full_act_record.0 */
+	{ /* class_tid: 1, thor, table: fkb_select.em */
 	.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,
+	.resource_type = TF_TBL_TYPE_EM_FKB,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto = 1,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 4,
+		.cond_start_idx = 2,
 		.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_EM_KEY_ID_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 44,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 120,
+	.result_bit_size = 106,
+	.result_num_fields = 106
 	},
-	{ /* class_tid: 2, stingray, table: l2_cntxt_tcam.0 */
+	{ /* class_tid: 1, thor, table: profile_tcam.l3_l4 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
+	.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto = 1,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 4,
+		.cond_start_idx = 2,
 		.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_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.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 = 83,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 70,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.encap_num_fields = 0,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 28,
+	.blob_key_bit_size = 94,
+	.key_bit_size = 94,
+	.key_num_fields = 43,
+	.result_start_idx = 226,
+	.result_bit_size = 33,
+	.result_num_fields = 8,
 	.ident_start_idx = 6,
-	.ident_nums = 1
+	.ident_nums = 2
 	},
-	{ /* class_tid: 2, stingray, table: l2_cntxt_tcam_cache.wr */
+	{ /* class_tid: 1, thor, table: profile_tcam_cache.wr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
+	.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_RX,
 	.execute_info = {
-		.cond_true_goto = 1,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 4,
+		.cond_start_idx = 2,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 96,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
-	.result_start_idx = 83,
-	.result_bit_size = 62,
-	.result_num_fields = 4,
-	.encap_num_fields = 0
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 71,
+	.blob_key_bit_size = 14,
+	.key_bit_size = 14,
+	.key_num_fields = 3,
+	.result_start_idx = 234,
+	.result_bit_size = 82,
+	.result_num_fields = 7
 	},
-	{ /* class_tid: 2, stingray, table: parif_def_lkup_arec_ptr.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 4,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-	.tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 87,
-	.result_bit_size = 32,
-	.result_num_fields = 1,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 2, stingray, table: parif_def_arec_ptr.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 4,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-	.tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 88,
-	.result_bit_size = 32,
-	.result_num_fields = 1,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 2, stingray, table: parif_def_err_arec_ptr.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
+	{ /* class_tid: 1, thor, table: em.ipv4 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
+	.resource_type = TF_MEM_INTERNAL,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto = 0,
+		.cond_true_goto  = 0,
+		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 4,
+		.cond_start_idx = 2,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-	.tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 89,
-	.result_bit_size = 32,
-	.result_num_fields = 1,
-	.encap_num_fields = 0
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
+	.byte_order = BNXT_ULP_BYTE_ORDER_BE,
+	.key_start_idx = 74,
+	.blob_key_bit_size = 0,
+	.key_bit_size = 0,
+	.key_num_fields = 114,
+	.result_start_idx = 241,
+	.result_bit_size = 0,
+	.result_num_fields = 6
 	},
-	{ /* class_tid: 3, stingray, table: int_full_act_record.0 */
+	{ /* class_tid: 2, thor, 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_VFR_CFA_ACTION,
-	.direction = TF_DIR_TX,
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto = 1,
+		.cond_true_goto  = 0,
+		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 4,
+		.cond_start_idx = 2,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 90,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 247,
 	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
+	.result_num_fields = 17
+	}
+};
+
+struct bnxt_ulp_mapper_cond_info ulp_thor_class_cond_list[] = {
+	/* cond_execute: class_tid: 1, control.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
 	},
-	{ /* class_tid: 3, stingray, table: l2_cntxt_tcam_bypass.vfr_0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 4,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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 = 97,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 116,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.encap_num_fields = 0,
-	.ident_start_idx = 7,
-	.ident_nums = 0
-	},
-	{ /* class_tid: 3, stingray, table: l2_cntxt_tcam_cache.rd */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 5,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 110,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
-	.ident_start_idx = 7,
-	.ident_nums = 1
+	/* cond_execute: class_tid: 1, control.1 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	}
+};
+
+struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
+	/* class_tid: 1, thor, table: mac_addr_cache.rd */
+	{
+	.field_info_mask = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+		},
+	.field_info_spec = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+		}
 	},
-	{ /* class_tid: 3, stingray, table: l2_cntxt_tcam.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 6,
-		.cond_nums = 2 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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,
-	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-	.key_start_idx = 111,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 129,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.encap_num_fields = 0,
-	.ident_start_idx = 8,
-	.ident_nums = 1
+	{
+	.field_info_mask = {
+		.description = "mac_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+		},
+	.field_info_spec = {
+		.description = "mac_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+		}
 	},
-	{ /* class_tid: 3, stingray, table: l2_cntxt_tcam_cache.wr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 8,
-		.cond_nums = 2 },
-	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 124,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
-	.result_start_idx = 142,
-	.result_bit_size = 62,
-	.result_num_fields = 4,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 3, stingray, table: parif_def_lkup_arec_ptr.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 146,
-	.result_bit_size = 32,
-	.result_num_fields = 1,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 3, stingray, table: parif_def_arec_ptr.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 147,
-	.result_bit_size = 32,
-	.result_num_fields = 1,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 3, stingray, table: parif_def_err_arec_ptr.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 0,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 148,
-	.result_bit_size = 32,
-	.result_num_fields = 1,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 4, stingray, table: int_vtag_encap_record.egr0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 149,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 12
-	},
-	{ /* class_tid: 4, stingray, table: int_full_act_record.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_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.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,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 161,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 4, stingray, table: l2_cntxt_tcam_bypass.egr0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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 = 125,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 187,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.encap_num_fields = 0,
-	.ident_start_idx = 9,
-	.ident_nums = 0
-	},
-	{ /* class_tid: 4, stingray, table: l2_cntxt_tcam_cache.wr_egr0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 138,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
-	.result_start_idx = 200,
-	.result_bit_size = 62,
-	.result_num_fields = 4,
-	.encap_num_fields = 0,
-	.ident_start_idx = 9,
-	.ident_nums = 0
-	},
-	{ /* class_tid: 4, stingray, table: int_full_act_record.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_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.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,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 204,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 4, stingray, table: l2_cntxt_tcam_bypass.dtagged_ing0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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 = 139,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 230,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.encap_num_fields = 0,
-	.ident_start_idx = 9,
-	.ident_nums = 0
-	},
-	{ /* class_tid: 4, stingray, table: l2_cntxt_tcam_bypass.stagged_ing0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto = 0,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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 = 152,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 243,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.encap_num_fields = 0,
-	.ident_start_idx = 9,
-	.ident_nums = 0
-	},
-	{ /* class_tid: 5, stingray, table: l2_cntxt_tcam.egr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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 = 165,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 256,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.encap_num_fields = 0,
-	.ident_start_idx = 9,
-	.ident_nums = 1
-	},
-	{ /* class_tid: 5, stingray, table: l2_cntxt_tcam_cache.egr_wr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 178,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
-	.result_start_idx = 269,
-	.result_bit_size = 62,
-	.result_num_fields = 4,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 5, stingray, table: parif_def_lkup_arec_ptr.egr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-	.tbl_operand = BNXT_ULP_CF_IDX_VF_FUNC_PARIF,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 273,
-	.result_bit_size = 32,
-	.result_num_fields = 1,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 5, stingray, table: parif_def_arec_ptr.egr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-	.tbl_operand = BNXT_ULP_CF_IDX_VF_FUNC_PARIF,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 274,
-	.result_bit_size = 32,
-	.result_num_fields = 1,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 5, stingray, table: parif_def_err_arec_ptr.egr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-	.tbl_operand = BNXT_ULP_CF_IDX_VF_FUNC_PARIF,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 275,
-	.result_bit_size = 32,
-	.result_num_fields = 1,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 5, stingray, table: int_full_act_record.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_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.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,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG,
-	.result_start_idx = 276,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 5, stingray, table: l2_cntxt_tcam_bypass.ing */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto = 0,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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 = 179,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 302,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.encap_num_fields = 0,
-	.ident_start_idx = 10,
-	.ident_nums = 0
-	},
-	{ /* class_tid: 6, stingray, 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_VFR_CFA_ACTION,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto = 0,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 315,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
-	}
-};
-
-struct bnxt_ulp_mapper_cond_info ulp_stingray_class_cond_list[] = {
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_FIELD_BIT_NOT_SET,
-	.cond_operand = BNXT_ULP_GLB_HF_ID_O_ETH_DMAC
-	},
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-	},
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
-	},
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
-	},
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
-	.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE
-	},
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_CF_NOT_SET,
-	.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE
-	},
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_CF_NOT_SET,
-	.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE
+	/* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
+	{
+	.field_info_mask = {
+		.description = "etype",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "etype",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_RF_NOT_SET,
-	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-	},
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_CF_NOT_SET,
-	.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE
-	},
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_RF_NOT_SET,
-	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-	}
-};
-
-struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
-	/* class_tid: 1, stingray, table: l2_cntxt_tcam_cache.rd */
-	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l2_ivlan_tpid_sel",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l2_ivlan_tpid_sel",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
-	/* class_tid: 1, stingray, table: l2_cntxt_tcam.0 */
 	{
 	.field_info_mask = {
 		.description = "l2_ivlan_vid",
 		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l2_ivlan_vid",
 		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_ovlan_tpid_sel",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_ovlan_tpid_sel",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
 		.description = "l2_ovlan_vid",
 		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l2_ovlan_vid",
 		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "two_vtags",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "two_vtags",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "vtag_present",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "vtag_present",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "mac1_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "mac1_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "mac0_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "mac0_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tunnel_id",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tunnel_id",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
+		.description = "tun_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "sparif",
+		.description = "tun_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "llc",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "llc",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "roce",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "roce",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "metadata",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "metadata",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "svif",
+		.field_bit_size = 11,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			0xff}
+			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "svif",
+		.field_bit_size = 11,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_CF_IDX_O_VTAG_NUM >> 8) & 0xff,
-			BNXT_ULP_CF_IDX_O_VTAG_NUM & 0xff}
+			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "parif",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "parif",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
+		.description = "spif",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
+		.description = "spif",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "loopback",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "loopback",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
+		.description = "recycle_cnt",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "mpass_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "key_type",
+		.description = "mpass_cnt",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1172,6 +698,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1180,17 +707,64 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			1}
 		}
 	},
-	/* class_tid: 1, stingray, table: profile_tcam_cache.rd */
+	/* class_tid: 1, thor, table: mac_addr_cache.wr */
+	{
+	.field_info_mask = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+		},
+	.field_info_spec = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "mac_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+		},
+	.field_info_spec = {
+		.description = "mac_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+		}
+	},
+	/* class_tid: 1, thor, table: profile_tcam_cache.rd */
 	{
 	.field_info_mask = {
 		.description = "recycle_cnt",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1199,6 +773,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "recycle_cnt",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1207,6 +782,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "prof_func_id",
 		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1215,17 +791,19 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "prof_func_id",
 		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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_L2_PROF_FUNC_ID >> 8) & 0xff,
+			BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
 		.field_bit_size = 5,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1234,6 +812,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "hdr_sig_id",
 		.field_bit_size = 5,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -1241,17 +820,19 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 			BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
 		}
 	},
-	/* class_tid: 1, stingray, table: profile_tcam.0 */
+	/* class_tid: 1, thor, table: profile_tcam.l3_l4 */
 	{
 	.field_info_mask = {
 		.description = "l4_hdr_is_udp_tcp",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l4_hdr_is_udp_tcp",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1260,6 +841,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l4_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1268,6 +850,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l4_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
 		.field_cond_opr = {
 			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
@@ -1280,16 +863,17 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			ULP_SR_SYM_L4_HDR_TYPE_TCP},
+			ULP_THOR_SYM_L4_HDR_TYPE_TCP},
 		.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr2 = {
-			ULP_SR_SYM_L4_HDR_TYPE_UDP}
+			ULP_THOR_SYM_L4_HDR_TYPE_UDP}
 		}
 	},
 	{
 	.field_info_mask = {
 		.description = "l4_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1298,6 +882,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l4_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1306,6 +891,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l4_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1314,22 +900,41 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l4_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			ULP_SR_SYM_L4_HDR_VALID_YES}
+			ULP_THOR_SYM_L4_HDR_VALID_YES}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "ieh",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "ieh",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
 		.description = "l3_ipv6_cmp_dst",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l3_ipv6_cmp_dst",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1338,12 +943,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l3_ipv6_cmp_src",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1352,12 +959,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l3_hdr_isIP",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l3_hdr_isIP",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1366,6 +975,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l3_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1374,6 +984,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l3_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
 		.field_cond_opr = {
 			((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
@@ -1386,16 +997,17 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 			(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			ULP_SR_SYM_L3_HDR_TYPE_IPV4},
+			ULP_THOR_SYM_L3_HDR_TYPE_IPV4},
 		.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr2 = {
-			ULP_SR_SYM_L3_HDR_TYPE_IPV6}
+			ULP_THOR_SYM_L3_HDR_TYPE_IPV6}
 		}
 	},
 	{
 	.field_info_mask = {
 		.description = "l3_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1404,6 +1016,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l3_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1412,6 +1025,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l3_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1420,24 +1034,25 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l3_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			ULP_SR_SYM_L3_HDR_VALID_YES}
+			ULP_THOR_SYM_L3_HDR_VALID_YES}
 		}
 	},
 	{
 	.field_info_mask = {
 		.description = "l2_two_vtags",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l2_two_vtags",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1446,25 +1061,23 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l2_vtag_present",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l2_vtag_present",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-			(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,
-			BNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}
+		.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_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1473,6 +1086,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l2_uc_mc_bc",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1481,6 +1095,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l2_hdr_type",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1489,6 +1104,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l2_hdr_type",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1497,6 +1113,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l2_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1505,6 +1122,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l2_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1513,6 +1131,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "l2_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1521,22 +1140,25 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "l2_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			ULP_SR_SYM_L2_HDR_VALID_YES}
+			ULP_THOR_SYM_L2_HDR_VALID_YES}
 		}
 	},
 	{
 	.field_info_mask = {
 		.description = "tun_hdr_flags",
 		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tun_hdr_flags",
 		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1545,12 +1167,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tun_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tun_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1559,12 +1183,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tun_hdr_err",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tun_hdr_err",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1573,6 +1199,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tun_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1581,6 +1208,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "tun_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1589,12 +1217,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl4_hdr_is_udp_tcp",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1603,12 +1233,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl4_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tl4_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1617,12 +1249,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl4_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tl4_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1631,6 +1265,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl4_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1639,6 +1274,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "tl4_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1647,12 +1283,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl3_ipv6_cmp_dst",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1661,12 +1299,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl3_ipv6_cmp_src",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1675,12 +1315,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl3_hdr_isIP",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tl3_hdr_isIP",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1689,12 +1331,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl3_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tl3_hdr_type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1703,12 +1347,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl3_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tl3_hdr_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1717,6 +1363,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl3_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1725,6 +1372,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "tl3_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1733,12 +1381,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl2_two_vtags",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tl2_two_vtags",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1747,12 +1397,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl2_vtag_present",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tl2_vtag_present",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1761,12 +1413,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl2_uc_mc_bc",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1775,12 +1429,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl2_hdr_type",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tl2_hdr_type",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1789,6 +1445,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "tl2_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1797,6 +1454,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "tl2_hdr_valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1805,26 +1463,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "hrec_next",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "hrec_next",
 		.field_bit_size = 1,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "reserved",
-		.field_bit_size = 9,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "reserved",
-		.field_bit_size = 9,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1833,6 +1479,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "prof_func_id",
 		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1841,6 +1488,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "prof_func_id",
 		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
 		.field_opr1 = {
@@ -1852,28 +1500,30 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "agg_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "agg_error",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "recycle_cnt",
-		.field_bit_size = 2,
+		.description = "metadata",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "recycle_cnt",
-		.field_bit_size = 2,
+		.description = "metadata",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1882,12 +1532,14 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "pkt_type_0",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "pkt_type_0",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1896,6 +1548,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "pkt_type_1",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1904,6 +1557,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "pkt_type_1",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1912,6 +1566,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1920,17 +1575,19 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "valid",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			1}
 		}
 	},
-	/* class_tid: 1, stingray, table: profile_tcam_cache.wr */
+	/* class_tid: 1, thor, table: profile_tcam_cache.wr */
 	{
 	.field_info_mask = {
 		.description = "recycle_cnt",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1939,6 +1596,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "recycle_cnt",
 		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -1947,6 +1605,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_mask = {
 		.description = "prof_func_id",
 		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1955,17 +1614,19 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "prof_func_id",
 		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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_L2_PROF_FUNC_ID >> 8) & 0xff,
+			BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
 		.field_bit_size = 5,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -1974,6 +1635,7 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 	.field_info_spec = {
 		.description = "hdr_sig_id",
 		.field_bit_size = 5,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -1981,1335 +1643,1503 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 			BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
 		}
 	},
-	/* class_tid: 1, stingray, table: em.int_0 */
+	/* class_tid: 1, thor, table: em.ipv4 */
 	{
 	.field_info_mask = {
-		.description = "spare",
-		.field_bit_size = 3,
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "spare",
-		.field_bit_size = 3,
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.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}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "local_cos",
-		.field_bit_size = 3,
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "local_cos",
-		.field_bit_size = 3,
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
-		.field_bit_size = 16,
+		.description = "parif",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
-		.field_bit_size = 16,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+		.description = "parif",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
-		.field_bit_size = 16,
+		.description = "spif",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
-		.field_bit_size = 16,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+		.description = "spif",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.ip_proto",
-		.field_bit_size = 8,
+		.description = "svif",
+		.field_bit_size = 11,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.ip_proto",
-		.field_bit_size = 8,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			ULP_SR_SYM_IP_PROTO_TCP},
-		.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr2 = {
-			ULP_SR_SYM_IP_PROTO_UDP}
+		.description = "svif",
+		.field_bit_size = 11,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.dst",
-		.field_bit_size = 32,
+		.description = "lcos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.dst",
-		.field_bit_size = 32,
+		.description = "lcos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.src",
-		.field_bit_size = 32,
+		.description = "meta",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.src",
-		.field_bit_size = 32,
+		.description = "meta",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.smac",
-		.field_bit_size = 48,
+		.description = "rcyc_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
-			0xff,
-			0xff,
-			0xff,
-			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_eth.smac",
-		.field_bit_size = 48,
+		.description = "rcyc_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_cntxt_id",
-		.field_bit_size = 10,
+		.description = "loopback",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_cntxt_id",
-		.field_bit_size = 10,
+		.description = "loopback",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "em_profile_id",
-		.field_bit_size = 8,
+		.description = "tl2_l2type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "em_profile_id",
-		.field_bit_size = 8,
+		.description = "tl2_l2type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
-	/* class_tid: 1, stingray, table: eem.ext_0 */
 	{
 	.field_info_mask = {
-		.description = "spare",
-		.field_bit_size = 275,
+		.description = "tl2_dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "spare",
-		.field_bit_size = 275,
+		.description = "tl2_dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "local_cos",
-		.field_bit_size = 3,
+		.description = "tl2_smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "local_cos",
-		.field_bit_size = 3,
+		.description = "tl2_smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
-		.field_bit_size = 16,
+		.description = "tl2_dt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
-		.field_bit_size = 16,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+		.description = "tl2_dt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
-		.field_bit_size = 16,
+		.description = "tl2_sa",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
-		.field_bit_size = 16,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+		.description = "tl2_sa",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.ip_proto",
-		.field_bit_size = 8,
+		.description = "tl2_nvt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.ip_proto",
-		.field_bit_size = 8,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			ULP_SR_SYM_IP_PROTO_TCP},
-		.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr2 = {
-			ULP_SR_SYM_IP_PROTO_UDP}
+		.description = "tl2_nvt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.dst",
-		.field_bit_size = 32,
+		.description = "tl2_ovp",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.dst",
-		.field_bit_size = 32,
+		.description = "tl2_ovp",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.src",
-		.field_bit_size = 32,
+		.description = "tl2_ovd",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.src",
-		.field_bit_size = 32,
+		.description = "tl2_ovd",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.smac",
-		.field_bit_size = 48,
+		.description = "tl2_ovv",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
-			0xff,
-			0xff,
-			0xff,
 			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_eth.smac",
-		.field_bit_size = 48,
+		.description = "tl2_ovv",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_cntxt_id",
-		.field_bit_size = 10,
+		.description = "tl2_ovt",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_cntxt_id",
-		.field_bit_size = 10,
+		.description = "tl2_ovt",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "em_profile_id",
-		.field_bit_size = 8,
+		.description = "tl2_ivp",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "em_profile_id",
-		.field_bit_size = 8,
+		.description = "tl2_ivp",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
-	/* class_tid: 2, stingray, table: l2_cntxt_tcam.0 */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl2_ivd",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl2_ivd",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
+		.description = "tl2_ivv",
 		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
+		.description = "tl2_ivv",
 		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tl2_ivt",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tl2_ivt",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl2_etype",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl2_etype",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-			(BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,
-			BNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
+		.description = "tl3_l3type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "sparif",
+		.description = "tl3_l3type",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_sip.ipv4",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_sip.ipv4",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_sip.ipv6",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_sip.ipv6",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "tl3_sip_selcmp.ipv6",
+		.field_bit_size = 72,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "tl3_sip_selcmp.ipv6",
+		.field_bit_size = 72,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_dip.ipv4",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_dip.ipv4",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_dip.ipv6",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_dip.ipv6",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "tl3_dip_selcmp.ipv6",
+		.field_bit_size = 72,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "tl3_dip_selcmp.ipv6",
+		.field_bit_size = 72,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "tl3_ttl",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "tl3_ttl",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "tl3_prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "tl3_prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
-	/* class_tid: 2, stingray, table: l2_cntxt_tcam_cache.wr */
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl3_fid.ipv4",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl3_fid.ipv4",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-			(BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,
-			BNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
-	/* class_tid: 3, stingray, table: l2_cntxt_tcam_bypass.vfr_0 */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_fid.ipv6",
+		.field_bit_size = 20,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_fid.ipv6",
+		.field_bit_size = 20,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_qos",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_qos",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tl3_ieh_nonext",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tl3_ieh_nonext",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl3_ieh_esp",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl3_ieh_esp",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "tl3_ieh_auth",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "tl3_ieh_auth",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_ieh_dest",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_ieh_dest",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_ieh_frag",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl3_ieh_frag",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "tl3_ieh_rthdr",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "tl3_ieh_rthdr",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_ieh_hop",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_ieh_hop",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_ieh_1frag",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_ieh_1frag",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "tl3_df",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "tl3_df",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "tl3_l3err",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "tl3_l3err",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "tl4_l4type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "tl4_l4type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
-	/* class_tid: 3, stingray, table: l2_cntxt_tcam_cache.rd */
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl4_src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl4_src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
-	/* class_tid: 3, stingray, table: l2_cntxt_tcam.0 */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_flags",
+		.field_bit_size = 9,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_flags",
+		.field_bit_size = 9,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tl4_seq",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tl4_seq",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl4_pa",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl4_pa",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "tl4_opt",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "tl4_opt",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_tcpts",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_tcpts",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_err",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_err",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "tuntype",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "tuntype",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tflags",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tflags",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tids",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tids",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "tid",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "tid",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "tctxts",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "tctxts",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "tctxt",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "tctxt",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
-	/* class_tid: 3, stingray, table: l2_cntxt_tcam_cache.wr */
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tqos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tqos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
-	/* class_tid: 4, stingray, table: l2_cntxt_tcam_bypass.egr0 */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "terr",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "terr",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_l2type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_l2type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
+		.description = "l2_dmac",
 		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
+		.description = "l2_dmac",
 		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l2_smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l2_smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l2_dt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l2_dt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_sa",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_sa",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_nvt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_nvt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l2_ovp",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l2_ovp",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l2_ovd",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l2_ovd",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l2_ovv",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l2_ovv",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "l2_ovt",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "l2_ovt",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l2_ivp",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l2_ivp",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "valid",
+		.description = "l2_ivd",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "valid",
+		.description = "l2_ivd",
 		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
-	/* class_tid: 4, stingray, table: l2_cntxt_tcam_cache.wr_egr0 */
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l2_ivv",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l2_ivv",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
-	/* class_tid: 4, stingray, table: l2_cntxt_tcam_bypass.dtagged_ing0 */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_ivt",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_ivt",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_etype",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
@@ -3317,1387 +3147,900 @@ struct bnxt_ulp_mapper_key_info ulp_stingray_class_key_info_list[] = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l2_etype",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l3_l3type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l3_l3type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l3_sip.ipv4",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l3_sip.ipv4",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
-			BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l3_sip.ipv6",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l3_sip.ipv6",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_sip_selcmp.ipv6",
+		.field_bit_size = 72,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_sip_selcmp.ipv6",
+		.field_bit_size = 72,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_dip.ipv4",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_dip.ipv4",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l3_dip.ipv6",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l3_dip.ipv6",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_dip_selcmp.ipv6",
+		.field_bit_size = 72,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_dip_selcmp.ipv6",
+		.field_bit_size = 72,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			2}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_ttl",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_ttl",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "l3_prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.description = "l3_prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_opr = {
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			ULP_SR_SYM_TUN_HDR_TYPE_NONE}
+			ULP_THOR_SYM_IP_PROTO_TCP},
+		.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr2 = {
+			ULP_THOR_SYM_IP_PROTO_UDP}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l3_fid.ipv4",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l3_fid.ipv4",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "l3_fid.ipv6",
+		.field_bit_size = 20,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "l3_fid.ipv6",
+		.field_bit_size = 20,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
-	/* class_tid: 4, stingray, table: l2_cntxt_tcam_bypass.stagged_ing0 */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_qos",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_qos",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_ieh_nonext",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_ieh_nonext",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l3_ieh_esp",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l3_ieh_esp",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l3_ieh_auth",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l3_ieh_auth",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l3_ieh_dest",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l3_ieh_dest",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_ieh_frag",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_ieh_frag",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_ieh_rthdr",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_ieh_rthdr",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l3_ieh_hop",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l3_ieh_hop",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_ieh_1frag",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_ieh_1frag",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_df",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_df",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
+		.description = "l3_l3err.ipv4",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
+		.description = "l3_l3err.ipv4",
 		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			ULP_SR_SYM_TUN_HDR_TYPE_NONE}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l3_l3err.ipv6",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l3_l3err.ipv6",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "l4_l4type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "l4_l4type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
-	/* class_tid: 5, stingray, table: l2_cntxt_tcam.egr */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.description = "l4_src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_opr = {
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr2 = {
+			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.description = "l4_src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_opr = {
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr2 = {
+			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.description = "l4_dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_opr = {
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr2 = {
+			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.description = "l4_dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_opr = {
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr2 = {
+			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l4_flags",
+		.field_bit_size = 9,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l4_flags",
+		.field_bit_size = 9,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l4_seq",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l4_seq",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l4_ack",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l4_ack",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_win",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_win",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_pa",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_pa",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l4_opt",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l4_opt",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l4_tcpts",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l4_tcpts",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l4_tsval",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
-		},
-	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "valid",
-		.field_bit_size = 1,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
-		},
-	.field_info_spec = {
-		.description = "valid",
-		.field_bit_size = 1,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
-		}
-	},
-	/* class_tid: 5, stingray, table: l2_cntxt_tcam_cache.egr_wr */
-	{
-	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
-		},
-	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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}
-		}
-	},
-	/* class_tid: 5, stingray, table: l2_cntxt_tcam_bypass.ing */
-	{
-	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l4_tsval",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l4_txecr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "sparif",
-		.field_bit_size = 4,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l4_txecr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
-	.field_info_spec = {
-		.description = "tun_hdr_type",
+		.description = "l4_err",
 		.field_bit_size = 4,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
-		},
-	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		}
-	},
-	{
-	.field_info_mask = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "l4_err",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_SKIP
 		}
 	}
 };
 
-struct bnxt_ulp_mapper_field_info ulp_stingray_class_result_field_list[] = {
-	/* class_tid: 1, stingray, table: l2_cntxt_tcam.0 */
-	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "prof_func_id",
-	.field_bit_size = 7,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-	.field_opr1 = {
-		(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,
-		BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}
-	},
-	{
-	.description = "l2_byp_lkup_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "parif",
-	.field_bit_size = 4,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "allowed_pri",
-	.field_bit_size = 8,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "default_pri",
-	.field_bit_size = 3,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "bd_act_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "byp_sp_lkup",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
-	},
-	{
-	.description = "pri_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* class_tid: 1, stingray, table: profile_tcam.0 */
-	{
-	.description = "wc_key_id",
-	.field_bit_size = 4,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		3}
-	},
-	{
-	.description = "wc_profile_id",
-	.field_bit_size = 8,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "wc_search_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "em_key_mask",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		(125 >> 8) & 0xff,
-		125 & 0xff}
-	},
-	{
-	.description = "em_key_id",
-	.field_bit_size = 5,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		3}
-	},
-	{
-	.description = "em_profile_id",
-	.field_bit_size = 8,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
-	},
-	{
-	.description = "pl_byp_lkup_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* class_tid: 1, stingray, table: profile_tcam_cache.wr */
+struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
+	/* class_tid: 1, thor, table: mac_addr_cache.rd */
 	{
 	.description = "rid",
 	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "wm_profile_id",
-	.field_bit_size = 8,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "flow_sig_id",
-	.field_bit_size = 8,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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: 1, stingray, table: em.int_0 */
-	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 33,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "act_rec_int",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "act_rec_size",
-	.field_bit_size = 5,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "key_size",
-	.field_bit_size = 9,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "reserved",
-	.field_bit_size = 11,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "strength",
-	.field_bit_size = 2,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		3}
-	},
-	{
-	.description = "l1_cacheable",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "valid",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
-	},
-	/* class_tid: 1, stingray, table: eem.ext_0 */
-	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 33,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		ULP_SR_SYM_EEM_EXT_FLOW_CNTR}
-	},
-	{
-	.description = "act_rec_int",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "act_rec_size",
-	.field_bit_size = 5,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
-	},
-	{
-	.description = "key_size",
-	.field_bit_size = 9,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		(173 >> 8) & 0xff,
-		173 & 0xff}
-	},
-	{
-	.description = "reserved",
-	.field_bit_size = 11,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "strength",
-	.field_bit_size = 2,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		3}
-	},
-	{
-	.description = "l1_cacheable",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "valid",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
-	},
-	/* class_tid: 2, stingray, table: int_full_act_record.0 */
-	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "age_enable",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "agg_cntr_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "rate_cntr_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "flow_cntr_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_mir",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_match",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "meter_id",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l3_rdir",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tl3_rdir",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l3_ttl_dec",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tl3_ttl_dec",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "decap_func",
-	.field_bit_size = 4,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "meter",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "mirror",
-	.field_bit_size = 2,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "drop",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "hit",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "type",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* class_tid: 2, stingray, table: l2_cntxt_tcam.0 */
-	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "prof_func_id",
-	.field_bit_size = 7,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "l2_byp_lkup_en",
-	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "parif",
-	.field_bit_size = 4,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "l2_cntxt_tcam_index",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "src_property_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "prof_func_id",
+	.field_bit_size = 7,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+		(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,
+		BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}
 	},
 	{
-	.description = "bd_act_en",
-	.field_bit_size = 1,
+	.description = "ctxt_meta_prof",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_rec_ptr",
+	.description = "def_ctxt_data",
 	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+		(4 >> 8) & 0xff,
+		4 & 0xff}
 	},
 	{
-	.description = "byp_sp_lkup",
-	.field_bit_size = 1,
+	.description = "ctxt_opcode",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		1}
+		ULP_THOR_SYM_CTXT_OPCODE_NORMAL_FLOW}
 	},
 	{
-	.description = "pri_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "parif",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 2, stingray, table: l2_cntxt_tcam_cache.wr */
+	/* class_tid: 1, thor, table: mac_addr_cache.wr */
 	{
 	.description = "rid",
 	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
@@ -4707,6 +4050,7 @@ struct bnxt_ulp_mapper_field_info ulp_stingray_class_result_field_list[] = {
 	{
 	.description = "l2_cntxt_tcam_index",
 	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
@@ -4716,6 +4060,7 @@ struct bnxt_ulp_mapper_field_info ulp_stingray_class_result_field_list[] = {
 	{
 	.description = "l2_cntxt_id",
 	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
@@ -4725,1712 +4070,1849 @@ struct bnxt_ulp_mapper_field_info ulp_stingray_class_result_field_list[] = {
 	{
 	.description = "src_property_ptr",
 	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 2, stingray, table: parif_def_lkup_arec_ptr.0 */
-	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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: 2, stingray, table: parif_def_arec_ptr.0 */
-	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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: 2, stingray, table: parif_def_err_arec_ptr.0 */
+	/* class_tid: 1, thor, table: fkb_select.wm */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "l2_cntxt_id.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-		BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+		1}
 	},
-	/* class_tid: 3, stingray, table: int_full_act_record.0 */
 	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
+	.description = "parif.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "age_enable",
+	.description = "spif.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "agg_cntr_en",
+	.description = "svif.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "rate_cntr_en",
+	.description = "lcos.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "flow_cntr_en",
+	.description = "meta.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
+	.description = "rcyc_cnt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_mir",
+	.description = "loopback.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_match",
+	.description = "tl2_l2type.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
+	.description = "tl2_dmac.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
+	.description = "tl2_smac.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
+	.description = "tl2_dt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
+	.description = "tl2_sa.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
+	.description = "tl2_nvt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "tl2_ovp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
+	.description = "tl2_ovd.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_rdir",
+	.description = "tl2_ovv.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_ttl_dec",
+	.description = "tl2_ovt.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "tl2_ivp.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
+	.description = "tl2_ivd.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}
-	},
-	{
-	.description = "pop_vlan",
+	.description = "tl2_ivv.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
+	.description = "tl2_ivt.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "tl2_etype.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
+	.description = "tl3_l3type.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "hit",
+	.description = "tl3_sip.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "type",
+	.description = "tl3_sip_selcmp.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 3, stingray, table: l2_cntxt_tcam_bypass.vfr_0 */
 	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
+	.description = "tl3_dip.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "reserved",
+	.description = "tl3_dip_selcmp.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "tl3_ttl.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
-	.field_bit_size = 4,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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,
+	.description = "tl3_prot.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "tl3_fid.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "tl3_qos.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "tl3_ieh_nonext.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
+	.description = "tl3_ieh_esp.en",
 	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
-	},
-	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
+	.description = "tl3_ieh_auth.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "tl3_ieh_dest.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "tl3_ieh_frag.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 3, stingray, table: l2_cntxt_tcam.0 */
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "tl3_ieh_rthdr.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "prof_func_id",
-	.field_bit_size = 7,
+	.description = "tl3_ieh_hop.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "tl3_ieh_1frag.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
-	.field_bit_size = 4,
+	.description = "tl3_df.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "tl3_l3err.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "tl4_l4type.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "tl4_src.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "tl4_dst.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
+	.description = "tl4_flags.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.description = "tl4_seq.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
+	.description = "tl4_pa.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "tl4_opt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "tl4_tcpts.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 3, stingray, table: l2_cntxt_tcam_cache.wr */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
+	.description = "tl4_err.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "tuntype.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "tflags.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_property_ptr",
-	.field_bit_size = 10,
+	.description = "tids.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 3, stingray, table: parif_def_lkup_arec_ptr.0 */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "tid.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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
 	},
-	/* class_tid: 3, stingray, table: parif_def_arec_ptr.0 */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "tctxts.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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
 	},
-	/* class_tid: 3, stingray, table: parif_def_err_arec_ptr.0 */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "tctxt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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
 	},
-	/* class_tid: 4, stingray, table: int_vtag_encap_record.egr0 */
 	{
-	.description = "ecv_tun_type",
-	.field_bit_size = 3,
+	.description = "tqos.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l4_type",
-	.field_bit_size = 3,
+	.description = "terr.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l3_type",
-	.field_bit_size = 3,
+	.description = "l2_l2type.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l2_en",
+	.description = "l2_dmac.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_vtag_type",
-	.field_bit_size = 4,
+	.description = "l2_smac.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		ULP_SR_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_custom_en",
+	.description = "l2_dt.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_valid",
+	.description = "l2_sa.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_tpid",
-	.field_bit_size = 16,
+	.description = "l2_nvt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		0x81,
-		0x00}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_vid",
-	.field_bit_size = 12,
+	.description = "l2_ovp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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
 	},
 	{
-	.description = "vtag_de",
+	.description = "l2_ovd.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
+	.description = "l2_ovv.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "spare",
-	.field_bit_size = 80,
+	.description = "l2_ovt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, stingray, table: int_full_act_record.egr0 */
 	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
+	.description = "l2_ivp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "age_enable",
+	.description = "l2_ivd.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "agg_cntr_en",
+	.description = "l2_ivv.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "rate_cntr_en",
+	.description = "l2_ivt.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "flow_cntr_en",
+	.description = "l2_etype.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
+	.description = "l3_l3type.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_mir",
+	.description = "l3_sip.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
-	.description = "tcpflags_match",
+	.description = "l3_sip_selcmp.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
+	.description = "l3_dip.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
-		BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
+		1}
 	},
 	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
+	.description = "l3_dip_selcmp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
+	.description = "l3_ttl.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
+	.description = "l3_prot.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
+	.description = "l3_fid.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "l3_qos.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
+	.description = "l3_ieh_nonext.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_rdir",
+	.description = "l3_ieh_esp.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_ttl_dec",
+	.description = "l3_ieh_auth.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "l3_ieh_dest.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
+	.description = "l3_ieh_frag.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		(ULP_SR_SYM_LOOPBACK_PORT >> 8) & 0xff,
-		ULP_SR_SYM_LOOPBACK_PORT & 0xff}
-	},
-	{
-	.description = "pop_vlan",
+	.description = "l3_ieh_rthdr.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
+	.description = "l3_ieh_hop.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "l3_ieh_1frag.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
+	.description = "l3_df.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "hit",
+	.description = "l3_l3err.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "type",
+	.description = "l4_l4type.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, stingray, table: l2_cntxt_tcam_bypass.egr0 */
 	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
+	.description = "l4_src.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
-	.description = "reserved",
+	.description = "l4_dst.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "l4_flags.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
-	.field_bit_size = 4,
+	.description = "l4_seq.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "l4_ack.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "l4_win.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "l4_pa.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "l4_opt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
+	.description = "l4_tcpts.en",
 	.field_bit_size = 1,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
-	},
-	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
+	.description = "l4_tsval.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "l4_txecr.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "l4_err.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, stingray, table: l2_cntxt_tcam_cache.wr_egr0 */
+	/* class_tid: 1, thor, table: fkb_select.em */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
+	.description = "l2_cntxt_id.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-		BNXT_ULP_RF_IDX_RID & 0xff}
+		1}
 	},
 	{
-	.description = "l2_cntxt_tcam_index",
-	.field_bit_size = 10,
+	.description = "parif.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "spif.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_property_ptr",
-	.field_bit_size = 10,
+	.description = "svif.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, stingray, table: int_full_act_record.ing0 */
 	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
+	.description = "lcos.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "age_enable",
+	.description = "meta.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "agg_cntr_en",
+	.description = "rcyc_cnt.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "rate_cntr_en",
+	.description = "loopback.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "flow_cntr_en",
+	.description = "tl2_l2type.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
+	.description = "tl2_dmac.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_mir",
+	.description = "tl2_smac.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_match",
+	.description = "tl2_dt.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
+	.description = "tl2_sa.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
+	.description = "tl2_nvt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
+	.description = "tl2_ovp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
+	.description = "tl2_ovd.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
+	.description = "tl2_ovv.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "tl2_ovt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
+	.description = "tl2_ivp.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_rdir",
+	.description = "tl2_ivd.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_ttl_dec",
+	.description = "tl2_ivv.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "tl2_ivt.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
+	.description = "tl2_etype.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.description = "tl3_l3type.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_VF_FUNC_VNIC >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_VF_FUNC_VNIC & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "pop_vlan",
+	.description = "tl3_sip.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
+	.description = "tl3_sip_selcmp.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "tl3_dip.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
+	.description = "tl3_dip_selcmp.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "hit",
+	.description = "tl3_ttl.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "type",
+	.description = "tl3_prot.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, stingray, table: l2_cntxt_tcam_bypass.dtagged_ing0 */
 	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
+	.description = "tl3_fid.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "reserved",
+	.description = "tl3_qos.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "tl3_ieh_nonext.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
-	.field_bit_size = 4,
+	.description = "tl3_ieh_esp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "tl3_ieh_auth.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "tl3_ieh_dest.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "tl3_ieh_frag.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "tl3_ieh_rthdr.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
+	.description = "tl3_ieh_hop.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.description = "tl3_ieh_1frag.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
+	.description = "tl3_df.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "tl3_l3err.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "tl4_l4type.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, stingray, table: l2_cntxt_tcam_bypass.stagged_ing0 */
 	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
+	.description = "tl4_src.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "reserved",
+	.description = "tl4_dst.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "tl4_flags.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
-	.field_bit_size = 4,
+	.description = "tl4_seq.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "tl4_pa.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "tl4_opt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "tl4_tcpts.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "tl4_err.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
+	.description = "tuntype.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.description = "tflags.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
+	.description = "tids.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "tid.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "tctxts.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, stingray, table: l2_cntxt_tcam.egr */
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "tctxt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "prof_func_id",
-	.field_bit_size = 7,
+	.description = "tqos.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "terr.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
-	.field_bit_size = 4,
+	.description = "l2_l2type.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_VF_FUNC_PARIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_VF_FUNC_PARIF & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "l2_dmac.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "l2_smac.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "l2_dt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "l2_sa.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
+	.description = "l2_nvt.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.description = "l2_ovp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
+	.description = "l2_ovd.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "l2_ovv.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "l2_ovt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, stingray, table: l2_cntxt_tcam_cache.egr_wr */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
+	.description = "l2_ivp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "l2_ivd.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "l2_ivv.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_property_ptr",
-	.field_bit_size = 10,
+	.description = "l2_ivt.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, stingray, table: parif_def_lkup_arec_ptr.egr */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "l2_etype.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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, stingray, table: parif_def_arec_ptr.egr */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "l3_l3type.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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, stingray, table: parif_def_err_arec_ptr.egr */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "l3_sip.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
-		BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
+		1}
 	},
-	/* class_tid: 5, stingray, table: int_full_act_record.ing */
 	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
+	.description = "l3_sip_selcmp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "age_enable",
+	.description = "l3_dip.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
-	.description = "agg_cntr_en",
+	.description = "l3_dip_selcmp.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "rate_cntr_en",
+	.description = "l3_ttl.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "flow_cntr_en",
+	.description = "l3_prot.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
+	.description = "l3_fid.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_mir",
+	.description = "l3_qos.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_match",
+	.description = "l3_ieh_nonext.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
+	.description = "l3_ieh_esp.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
+	.description = "l3_ieh_auth.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
+	.description = "l3_ieh_dest.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
+	.description = "l3_ieh_frag.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
+	.description = "l3_ieh_rthdr.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "l3_ieh_hop.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
+	.description = "l3_ieh_1frag.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_rdir",
+	.description = "l3_df.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_ttl_dec",
+	.description = "l3_l3err.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "l4_l4type.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
+	.description = "l4_src.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.description = "l4_dst.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}
+		1}
 	},
 	{
-	.description = "pop_vlan",
+	.description = "l4_flags.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
+	.description = "l4_seq.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "l4_ack.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
+	.description = "l4_win.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "hit",
+	.description = "l4_pa.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "type",
+	.description = "l4_opt.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, stingray, table: l2_cntxt_tcam_bypass.ing */
 	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
+	.description = "l4_tcpts.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "reserved",
+	.description = "l4_tsval.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "l4_txecr.en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
-	.field_bit_size = 4,
+	.description = "l4_err.en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 1, thor, table: profile_tcam.l3_l4 */
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "wc_key_id",
+	.field_bit_size = 6,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "wc_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "wc_search_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "em_key_type",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
-	.field_bit_size = 1,
+	.description = "em_key_id",
+	.field_bit_size = 6,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+		(BNXT_ULP_RF_IDX_EM_KEY_ID_0 >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_EM_KEY_ID_0 & 0xff}
 	},
 	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.description = "em_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.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 = "byp_sp_lkup",
+	.description = "em_search_en",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
 		1}
 	},
 	{
-	.description = "pri_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "pl_byp_lkup_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 1, thor, table: profile_tcam_cache.wr */
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
 	},
-	/* class_tid: 6, stingray, table: int_full_act_record.0 */
 	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
+	.description = "profile_tcam_index",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.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 = "age_enable",
-	.field_bit_size = 1,
+	.description = "em_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.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 = "agg_cntr_en",
-	.field_bit_size = 1,
+	.description = "em_key_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+		(BNXT_ULP_RF_IDX_EM_KEY_ID_0 >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_EM_KEY_ID_0 & 0xff}
 	},
 	{
-	.description = "rate_cntr_en",
-	.field_bit_size = 1,
+	.description = "wc_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+		(BNXT_ULP_RF_IDX_WC_PROFILE_ID_0 >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_WC_PROFILE_ID_0 & 0xff}
 	},
 	{
-	.description = "flow_cntr_en",
-	.field_bit_size = 1,
+	.description = "wc_key_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+		(BNXT_ULP_RF_IDX_WC_KEY_ID_0 >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_WC_KEY_ID_0 & 0xff}
 	},
 	{
-	.description = "tcpflags_key",
+	.description = "flow_sig_id",
 	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.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: 1, thor, table: em.ipv4 */
 	{
-	.description = "tcpflags_mir",
+	.description = "valid",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
-	.description = "tcpflags_match",
-	.field_bit_size = 1,
+	.description = "strength",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		3}
+	},
+	{
+	.description = "arec_ptr_or_md",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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 = "opcode",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
+	.description = "meta_prof",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
+	.description = "ctxt_data",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 2, thor, table: int_full_act_record.0 */
 	{
-	.description = "tcp_dst_port",
+	.description = "sp_rec_ptr",
 	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
+	.description = "encap_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_src_port",
+	.description = "mod_rec_ptr",
 	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "rsvd1",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
-	.field_bit_size = 1,
+	.description = "rsvd0",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_rdir",
-	.field_bit_size = 1,
+	.description = "decap_func",
+	.field_bit_size = 5,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_ttl_dec",
-	.field_bit_size = 1,
+	.description = "meter",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "stats_op",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
+	.description = "stats_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 	.field_opr1 = {
-		(ULP_SR_SYM_LOOPBACK_PORT >> 8) & 0xff,
-		ULP_SR_SYM_LOOPBACK_PORT & 0xff}
+		(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}
 	},
 	{
-	.description = "pop_vlan",
+	.description = "use_default",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
+	.description = "mirror",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "cnd_copy",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
+	.description = "vlan_dlt_rpt",
 	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "drop",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "hit",
 	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "type",
-	.field_bit_size = 1,
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	}
 };
 
-struct bnxt_ulp_mapper_ident_info ulp_stingray_class_ident_list[] = {
-	/* class_tid: 1, stingray, table: l2_cntxt_tcam_cache.rd */
-	{
-	.description = "l2_cntxt_id",
-	.regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
-	.ident_bit_size = 10,
-	.ident_bit_pos = 42
-	},
-	/* class_tid: 1, stingray, table: l2_cntxt_tcam.0 */
+struct bnxt_ulp_mapper_ident_info ulp_thor_class_ident_list[] = {
+	/* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
 	{
 	.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
+	.ident_bit_pos = 29
 	},
-	/* class_tid: 1, stingray, table: profile_tcam_cache.rd */
+	/* class_tid: 1, thor, table: profile_tcam_cache.rd */
 	{
-	.description = "profile_tcam_index",
-	.regfile_idx = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
-	.ident_bit_size = 10,
-	.ident_bit_pos = 32
+	.description = "em_key_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_EM_KEY_ID_0,
+	.ident_bit_size = 8,
+	.ident_bit_pos = 50
 	},
 	{
 	.description = "em_profile_id",
@@ -6442,49 +5924,35 @@ struct bnxt_ulp_mapper_ident_info ulp_stingray_class_ident_list[] = {
 	.description = "flow_sig_id",
 	.regfile_idx = BNXT_ULP_RF_IDX_FLOW_SIG_ID,
 	.ident_bit_size = 8,
-	.ident_bit_pos = 58
+	.ident_bit_pos = 74
 	},
-	/* class_tid: 1, stingray, table: profile_tcam.0 */
 	{
-	.description = "em_profile_id",
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.ident_type = TF_IDENT_TYPE_EM_PROF,
-	.regfile_idx = BNXT_ULP_RF_IDX_EM_PROFILE_ID_0,
+	.description = "wc_key_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_WC_KEY_ID_0,
 	.ident_bit_size = 8,
-	.ident_bit_pos = 28
-	},
-	/* class_tid: 2, stingray, table: l2_cntxt_tcam.0 */
-	{
-	.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
+	.ident_bit_pos = 66
 	},
-	/* class_tid: 3, stingray, table: l2_cntxt_tcam_cache.rd */
 	{
-	.description = "l2_cntxt_id",
-	.regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
-	.ident_bit_size = 10,
-	.ident_bit_pos = 42
+	.description = "wc_profile_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_WC_PROFILE_ID_0,
+	.ident_bit_size = 8,
+	.ident_bit_pos = 58
 	},
-	/* class_tid: 3, stingray, table: l2_cntxt_tcam.0 */
+	/* class_tid: 1, thor, table: profile_tcam.l3_l4 */
 	{
-	.description = "l2_cntxt_id",
+	.description = "wc_profile_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
+	.ident_type = TF_IDENT_TYPE_WC_PROF,
+	.regfile_idx = BNXT_ULP_RF_IDX_WC_PROFILE_ID_0,
+	.ident_bit_size = 8,
+	.ident_bit_pos = 6
 	},
-	/* class_tid: 5, stingray, table: l2_cntxt_tcam.egr */
 	{
-	.description = "l2_cntxt_id",
+	.description = "em_profile_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
+	.ident_type = TF_IDENT_TYPE_EM_PROF,
+	.regfile_idx = BNXT_ULP_RF_IDX_EM_PROFILE_ID_0,
+	.ident_bit_size = 8,
+	.ident_bit_pos = 23
 	}
 };
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c
index 9483e29323..2655bfdb9d 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
-/* date: Tue Jan 26 15:51:49 2021 */
+/* date: Wed Mar  3 16:36:04 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -84,13 +84,14 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 9,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 0,
 	.blob_key_bit_size = 1,
 	.key_bit_size = 1,
@@ -107,7 +108,7 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 10,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
@@ -115,6 +116,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 0,
 	.result_bit_size = 64,
 	.result_num_fields = 1
@@ -129,7 +131,7 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 11,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
@@ -137,6 +139,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 1,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
@@ -160,6 +163,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 13,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
@@ -183,6 +187,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 39,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
@@ -199,7 +204,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 		.cond_nums = 0 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
 	{ /* act_tid: 2, wh_plus, table: mirror_tbl.alloc */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
@@ -219,6 +225,7 @@ 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,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 77,
 	.result_bit_size = 32,
 	.result_num_fields = 6
@@ -232,7 +239,7 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 12,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
@@ -241,6 +248,7 @@ 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,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 83,
 	.result_bit_size = 64,
 	.result_num_fields = 1
@@ -264,6 +272,7 @@ 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,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 84,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
@@ -288,6 +297,7 @@ 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,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 110,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
@@ -310,6 +320,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 148,
 	.result_bit_size = 32,
 	.result_num_fields = 6
@@ -330,6 +341,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 1,
 	.blob_key_bit_size = 1,
 	.key_bit_size = 1,
@@ -347,13 +359,14 @@ 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_OR,
+		.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,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 156,
 	.result_bit_size = 64,
 	.result_num_fields = 1
@@ -367,13 +380,14 @@ 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_OR,
+		.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_MODIFY_IPV4_SRC_PTR_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 157,
 	.result_bit_size = 32,
 	.result_num_fields = 1
@@ -387,13 +401,14 @@ 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_OR,
+		.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_MODIFY_IPV4_DST_PTR_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 158,
 	.result_bit_size = 32,
 	.result_num_fields = 1
@@ -414,6 +429,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 159,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
@@ -436,6 +452,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 171,
 	.result_bit_size = 128,
 	.result_num_fields = 26
@@ -457,6 +474,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 197,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
@@ -471,13 +489,14 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 16,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 235,
 	.result_bit_size = 64,
 	.result_num_fields = 1
@@ -492,13 +511,14 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 17,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 236,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
@@ -521,6 +541,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 248,
 	.result_bit_size = 128,
 	.result_num_fields = 26
@@ -535,13 +556,14 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 18,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 274,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
@@ -557,13 +579,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
+		.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,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 312,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
@@ -578,13 +601,14 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.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,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 350,
 	.result_bit_size = 64,
 	.result_num_fields = 1
@@ -598,13 +622,14 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.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_SRC_PTR_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 351,
 	.result_bit_size = 32,
 	.result_num_fields = 1
@@ -618,13 +643,14 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 22,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 352,
 	.result_bit_size = 32,
 	.result_num_fields = 1
@@ -645,6 +671,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 353,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
@@ -667,6 +694,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 365,
 	.result_bit_size = 128,
 	.result_num_fields = 26
@@ -688,6 +716,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 391,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
@@ -702,13 +731,14 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 23,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 429,
 	.result_bit_size = 64,
 	.result_num_fields = 1
@@ -722,13 +752,14 @@ 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_OR,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 24,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 430,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
@@ -743,13 +774,14 @@ 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_OR,
+		.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_MAIN_SP_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 433,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
@@ -772,6 +804,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 436,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
@@ -794,6 +827,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 448,
 	.result_bit_size = 128,
 	.result_num_fields = 26
@@ -815,6 +849,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.result_start_idx = 474,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c
index 84f3900141..c636fd2aca 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
-/* date: Fri Jan 29 09:44:41 2021 */
+/* date: Wed Mar  3 16:36:04 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -15,71 +15,41 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_class_tmpl_list[] = {
 	/* class_tid: 1, wh_plus, ingress */
 	[1] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 14,
+	.num_tbls = 17,
 	.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 }
 	},
 	/* class_tid: 2, wh_plus, egress */
 	[2] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.num_tbls = 14,
-	.start_tbl_idx = 14,
+	.start_tbl_idx = 17,
 	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 6,
-		.cond_nums = 0 }
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 17,
+		.cond_nums = 1 }
 	},
 	/* class_tid: 3, wh_plus, ingress */
 	[3] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 8,
-	.start_tbl_idx = 28,
+	.num_tbls = 23,
+	.start_tbl_idx = 31,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 12,
+		.cond_start_idx = 24,
 		.cond_nums = 0 }
 	},
 	/* class_tid: 4, wh_plus, egress */
 	[4] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 14,
-	.start_tbl_idx = 36,
-	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 13,
-		.cond_nums = 0 }
-	},
-	/* class_tid: 5, wh_plus, egress */
-	[5] = {
-	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 9,
-	.start_tbl_idx = 50,
-	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 18,
-		.cond_nums = 0 }
-	},
-	/* class_tid: 6, wh_plus, egress */
-	[6] = {
-	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 9,
-	.start_tbl_idx = 59,
-	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 19,
-		.cond_nums = 0 }
-	},
-	/* class_tid: 7, wh_plus, egress */
-	[7] = {
-	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 1,
-	.start_tbl_idx = 68,
+	.num_tbls = 19,
+	.start_tbl_idx = 54,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 20,
+		.cond_start_idx = 30,
 		.cond_nums = 0 }
 	}
 };
@@ -94,13 +64,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 5,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.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_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 0,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
@@ -117,19 +88,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 1,
+		.cond_start_idx = 2,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 1,
 	.blob_key_bit_size = 56,
 	.key_bit_size = 56,
 	.key_num_fields = 2,
-	.result_start_idx = 0,
-	.result_bit_size = 62,
-	.result_num_fields = 4
+	.ident_start_idx = 1,
+	.ident_nums = 1
 	},
 	{ /* class_tid: 1, wh_plus, table: control.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
@@ -137,12 +108,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 3,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 2,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
 	{ /* class_tid: 1, wh_plus, table: l2_cntxt_tcam.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
@@ -152,22 +124,24 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 2,
+		.cond_start_idx = 3,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 3,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 4,
+	.result_start_idx = 0,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 1,
+	.ident_start_idx = 2,
 	.ident_nums = 1
 	},
 	{ /* class_tid: 1, wh_plus, table: mac_addr_cache.wr */
@@ -179,17 +153,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 2,
+		.cond_start_idx = 3,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 16,
 	.blob_key_bit_size = 56,
 	.key_bit_size = 56,
 	.key_num_fields = 2,
-	.result_start_idx = 17,
+	.result_start_idx = 13,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
@@ -203,17 +178,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 2,
+		.cond_start_idx = 3,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_FLOW_SIG_ID_MATCH,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 18,
 	.blob_key_bit_size = 14,
 	.key_bit_size = 14,
 	.key_num_fields = 3,
-	.ident_start_idx = 2,
+	.ident_start_idx = 3,
 	.ident_nums = 3
 	},
 	{ /* class_tid: 1, wh_plus, table: control.1 */
@@ -221,24 +197,25 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
-		.cond_false_goto = 4,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 2,
+		.cond_false_goto = 5,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 3,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
 	{ /* class_tid: 1, wh_plus, table: profile_tcam.ipv4 */
 	.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  = 2,
+		.cond_true_goto  = 3,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 3,
-		.cond_nums = 1 },
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 4,
+		.cond_nums = 2 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
@@ -246,14 +223,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 21,
 	.blob_key_bit_size = 81,
 	.key_bit_size = 81,
 	.key_num_fields = 43,
-	.result_start_idx = 21,
+	.result_start_idx = 17,
 	.result_bit_size = 38,
 	.result_num_fields = 17,
-	.ident_start_idx = 5,
+	.ident_start_idx = 6,
 	.ident_nums = 1
 	},
 	{ /* class_tid: 1, wh_plus, table: profile_tcam.ipv6 */
@@ -263,9 +241,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 4,
-		.cond_nums = 0 },
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 6,
+		.cond_nums = 2 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
@@ -273,14 +251,43 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
 	.key_start_idx = 64,
 	.blob_key_bit_size = 81,
 	.key_bit_size = 81,
 	.key_num_fields = 43,
-	.result_start_idx = 38,
+	.result_start_idx = 34,
 	.result_bit_size = 38,
 	.result_num_fields = 17,
-	.ident_start_idx = 6,
+	.ident_start_idx = 7,
+	.ident_nums = 1
+	},
+	{ /* class_tid: 1, wh_plus, table: profile_tcam.vxlan */
+	.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_AND,
+		.cond_start_idx = 8,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
+	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
+	.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,
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 107,
+	.blob_key_bit_size = 81,
+	.key_bit_size = 81,
+	.key_num_fields = 43,
+	.result_start_idx = 51,
+	.result_bit_size = 38,
+	.result_num_fields = 17,
+	.ident_start_idx = 8,
 	.ident_nums = 1
 	},
 	{ /* class_tid: 1, wh_plus, table: profile_tcam_cache.wr */
@@ -293,17 +300,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 4,
+		.cond_start_idx = 9,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 107,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 150,
 	.blob_key_bit_size = 14,
 	.key_bit_size = 14,
 	.key_num_fields = 3,
-	.result_start_idx = 55,
+	.result_start_idx = 68,
 	.result_bit_size = 74,
 	.result_num_fields = 5
 	},
@@ -315,18 +323,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 4,
-		.cond_nums = 1 },
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 9,
+		.cond_nums = 2 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 110,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 153,
 	.blob_key_bit_size = 176,
 	.key_bit_size = 176,
 	.key_num_fields = 10,
-	.result_start_idx = 60,
+	.result_start_idx = 73,
 	.result_bit_size = 64,
 	.result_num_fields = 9
 	},
@@ -338,18 +347,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 5,
-		.cond_nums = 1 },
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 11,
+		.cond_nums = 2 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 120,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 163,
 	.blob_key_bit_size = 448,
 	.key_bit_size = 448,
 	.key_num_fields = 10,
-	.result_start_idx = 69,
+	.result_start_idx = 82,
 	.result_bit_size = 64,
 	.result_num_fields = 9
 	},
@@ -361,18 +371,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 6,
-		.cond_nums = 0 },
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 13,
+		.cond_nums = 2 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 130,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 173,
 	.blob_key_bit_size = 416,
 	.key_bit_size = 416,
 	.key_num_fields = 11,
-	.result_start_idx = 78,
+	.result_start_idx = 91,
 	.result_bit_size = 64,
 	.result_num_fields = 9
 	},
@@ -380,21 +391,69 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
 	.resource_type = TF_MEM_EXTERNAL,
 	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 15,
+		.cond_nums = 2 },
+	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 184,
+	.blob_key_bit_size = 448,
+	.key_bit_size = 448,
+	.key_num_fields = 11,
+	.result_start_idx = 100,
+	.result_bit_size = 64,
+	.result_num_fields = 9
+	},
+	{ /* class_tid: 1, wh_plus, table: em.vxlan */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
+	.resource_type = TF_MEM_INTERNAL,
+	.direction = TF_DIR_RX,
+	.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPC_EXECUTE_IF_INT,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 17,
+		.cond_nums = 0 },
+	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 195,
+	.blob_key_bit_size = 200,
+	.key_bit_size = 200,
+	.key_num_fields = 11,
+	.result_start_idx = 109,
+	.result_bit_size = 64,
+	.result_num_fields = 9
+	},
+	{ /* class_tid: 1, wh_plus, table: eem.vxlan */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
+	.resource_type = TF_MEM_EXTERNAL,
+	.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 = 6,
+		.cond_start_idx = 17,
 		.cond_nums = 0 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 141,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 206,
 	.blob_key_bit_size = 448,
 	.key_bit_size = 448,
 	.key_num_fields = 11,
-	.result_start_idx = 87,
+	.result_start_idx = 118,
 	.result_bit_size = 64,
 	.result_num_fields = 9
 	},
@@ -406,18 +465,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 5,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 6,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 18,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 152,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 217,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.ident_start_idx = 7,
+	.ident_start_idx = 9,
 	.ident_nums = 1
 	},
 	{ /* class_tid: 2, wh_plus, table: mac_addr_cache.rd */
@@ -429,19 +489,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 7,
+		.cond_start_idx = 19,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 153,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 218,
 	.blob_key_bit_size = 56,
 	.key_bit_size = 56,
 	.key_num_fields = 2,
-	.result_start_idx = 96,
-	.result_bit_size = 62,
-	.result_num_fields = 4
+	.ident_start_idx = 10,
+	.ident_nums = 1
 	},
 	{ /* class_tid: 2, wh_plus, table: control.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
@@ -449,12 +509,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 3,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 7,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 19,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
 	{ /* class_tid: 2, wh_plus, table: l2_cntxt_tcam.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
@@ -464,7 +525,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 8,
+		.cond_start_idx = 20,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -473,14 +534,15 @@ 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 = 155,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 220,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 100,
+	.result_start_idx = 127,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 8,
+	.ident_start_idx = 11,
 	.ident_nums = 1
 	},
 	{ /* class_tid: 2, wh_plus, table: mac_addr_cache.wr */
@@ -492,17 +554,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 8,
+		.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_HASH,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 168,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 233,
 	.blob_key_bit_size = 56,
 	.key_bit_size = 56,
 	.key_num_fields = 2,
-	.result_start_idx = 113,
+	.result_start_idx = 140,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
@@ -515,17 +578,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 8,
+		.cond_start_idx = 20,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_FLOW_SIG_ID_MATCH,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 170,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 235,
 	.blob_key_bit_size = 14,
 	.key_bit_size = 14,
 	.key_num_fields = 3,
-	.ident_start_idx = 9,
+	.ident_start_idx = 12,
 	.ident_nums = 3
 	},
 	{ /* class_tid: 2, wh_plus, table: control.1 */
@@ -534,12 +598,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 4,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 8,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 20,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
 	{ /* class_tid: 2, wh_plus, table: profile_tcam.ipv4 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
@@ -548,8 +613,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 2,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 9,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 21,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
@@ -558,14 +623,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-	.key_start_idx = 173,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 238,
 	.blob_key_bit_size = 81,
 	.key_bit_size = 81,
 	.key_num_fields = 43,
-	.result_start_idx = 117,
+	.result_start_idx = 144,
 	.result_bit_size = 38,
 	.result_num_fields = 17,
-	.ident_start_idx = 12,
+	.ident_start_idx = 15,
 	.ident_nums = 1
 	},
 	{ /* class_tid: 2, wh_plus, table: profile_tcam.ipv6 */
@@ -576,7 +642,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 22,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
@@ -585,14 +651,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-	.key_start_idx = 216,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 281,
 	.blob_key_bit_size = 81,
 	.key_bit_size = 81,
 	.key_num_fields = 43,
-	.result_start_idx = 134,
+	.result_start_idx = 161,
 	.result_bit_size = 38,
 	.result_num_fields = 17,
-	.ident_start_idx = 13,
+	.ident_start_idx = 16,
 	.ident_nums = 1
 	},
 	{ /* class_tid: 2, wh_plus, table: profile_tcam_cache.wr */
@@ -604,17 +671,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 22,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 259,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 324,
 	.blob_key_bit_size = 14,
 	.key_bit_size = 14,
 	.key_num_fields = 3,
-	.result_start_idx = 151,
+	.result_start_idx = 178,
 	.result_bit_size = 74,
 	.result_num_fields = 5
 	},
@@ -626,18 +694,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 10,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 22,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 262,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 327,
 	.blob_key_bit_size = 176,
 	.key_bit_size = 176,
 	.key_num_fields = 10,
-	.result_start_idx = 156,
+	.result_start_idx = 183,
 	.result_bit_size = 64,
 	.result_num_fields = 9
 	},
@@ -649,18 +718,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 11,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 23,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 272,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 337,
 	.blob_key_bit_size = 448,
 	.key_bit_size = 448,
 	.key_num_fields = 10,
-	.result_start_idx = 165,
+	.result_start_idx = 192,
 	.result_bit_size = 64,
 	.result_num_fields = 9
 	},
@@ -673,17 +743,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 12,
+		.cond_start_idx = 24,
 		.cond_nums = 0 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 282,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 347,
 	.blob_key_bit_size = 416,
 	.key_bit_size = 416,
 	.key_num_fields = 11,
-	.result_start_idx = 174,
+	.result_start_idx = 201,
 	.result_bit_size = 64,
 	.result_num_fields = 9
 	},
@@ -695,21 +766,46 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 12,
+		.cond_start_idx = 24,
 		.cond_nums = 0 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-	.key_start_idx = 293,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 358,
 	.blob_key_bit_size = 448,
 	.key_bit_size = 448,
 	.key_num_fields = 11,
-	.result_start_idx = 183,
+	.result_start_idx = 210,
 	.result_bit_size = 64,
 	.result_num_fields = 9
 	},
-	{ /* class_tid: 3, wh_plus, table: int_full_act_record.0 */
+	{ /* class_tid: 3, wh_plus, table: port_table.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_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 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 369,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.result_start_idx = 219,
+	.result_bit_size = 144,
+	.result_num_fields = 4
+	},
+	{ /* class_tid: 3, wh_plus, table: int_full_act_record.ing_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
 	.resource_sub_type =
@@ -719,18 +815,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 24,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 192,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 223,
 	.result_bit_size = 128,
 	.result_num_fields = 26
 	},
-	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.rd */
+	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_rd */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -739,33 +836,35 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 24,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 304,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 370,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.ident_start_idx = 14,
+	.ident_start_idx = 17,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 3, wh_plus, table: control.0 */
+	{ /* class_tid: 3, wh_plus, table: control.ing_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
 	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 3,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 12,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 24,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
-	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.0 */
+	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.ing_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
 	.direction = TF_DIR_RX,
@@ -773,7 +872,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 25,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -784,17 +883,18 @@ 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 = 305,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 371,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 218,
+	.result_start_idx = 249,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 14,
+	.ident_start_idx = 17,
 	.ident_nums = 1
 	},
-	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.wr */
+	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_wr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -803,21 +903,22 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 25,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 318,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 384,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.result_start_idx = 231,
+	.result_start_idx = 262,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
-	{ /* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.0 */
+	{ /* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.ing_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
 	.resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
 	.direction = TF_DIR_RX,
@@ -825,17 +926,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 25,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 235,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 266,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
-	{ /* class_tid: 3, wh_plus, table: parif_def_arec_ptr.0 */
+	{ /* class_tid: 3, wh_plus, table: parif_def_arec_ptr.ing_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
 	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
 	.direction = TF_DIR_RX,
@@ -843,47 +945,50 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 25,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 236,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 267,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
-	{ /* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.0 */
+	{ /* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.ing_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
 	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
 	.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 = 13,
+		.cond_start_idx = 25,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 237,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 268,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
-	{ /* class_tid: 4, wh_plus, table: control.0 */
+	{ /* class_tid: 3, wh_plus, table: control.egr_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 6,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 13,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 25,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
-	{ /* class_tid: 4, wh_plus, table: int_full_act_record.vfr */
+	{ /* class_tid: 3, wh_plus, table: int_full_act_record.egr_vfr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
 	.resource_sub_type =
@@ -893,19 +998,20 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 14,
+		.cond_start_idx = 26,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 238,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 269,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
 	.encap_num_fields = 0
 	},
-	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.rd_vfr */
+	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_rd_vfr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -914,33 +1020,35 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 14,
+		.cond_start_idx = 26,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 319,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 385,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.ident_start_idx = 15,
+	.ident_start_idx = 18,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 4, wh_plus, table: control.1 */
+	{ /* class_tid: 3, wh_plus, table: control.egr_1 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 0,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 14,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 26,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
-	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr */
+	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_bypass.egr_vfr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
 	.direction = TF_DIR_TX,
@@ -948,7 +1056,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 15,
+		.cond_start_idx = 27,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -957,17 +1065,18 @@ 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 = 320,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 386,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 264,
+	.result_start_idx = 295,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 15,
+	.ident_start_idx = 18,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.wr_vfr */
+	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr_vfr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -976,21 +1085,22 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 15,
+		.cond_start_idx = 27,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 333,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 399,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.result_start_idx = 277,
+	.result_start_idx = 308,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
-	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.rd */
+	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.rd */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -999,33 +1109,35 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 15,
+		.cond_start_idx = 27,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 334,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 400,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.ident_start_idx = 15,
+	.ident_start_idx = 18,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 4, wh_plus, table: control.2 */
+	{ /* class_tid: 3, wh_plus, table: control.egr_2 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 3,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 15,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 27,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
-	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam.0 */
+	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.egr_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
 	.direction = TF_DIR_TX,
@@ -1033,7 +1145,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 16,
+		.cond_start_idx = 28,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -1042,17 +1154,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-	.key_start_idx = 335,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 401,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 281,
+	.result_start_idx = 312,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 15,
+	.ident_start_idx = 18,
 	.ident_nums = 1
 	},
-	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.wr */
+	{ /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1061,21 +1174,22 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 16,
+		.cond_start_idx = 28,
 		.cond_nums = 2 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 348,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 414,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.result_start_idx = 294,
+	.result_start_idx = 325,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
-	{ /* class_tid: 4, wh_plus, table: int_full_act_record.0 */
+	{ /* class_tid: 3, wh_plus, table: int_full_act_record.egr_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
 	.resource_sub_type =
@@ -1085,19 +1199,20 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 30,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 298,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 329,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
 	.encap_num_fields = 0
 	},
-	{ /* class_tid: 4, wh_plus, table: parif_def_lkup_arec_ptr.0 */
+	{ /* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.egr_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
 	.resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
 	.direction = TF_DIR_TX,
@@ -1105,17 +1220,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 30,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 324,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 355,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
-	{ /* class_tid: 4, wh_plus, table: parif_def_arec_ptr.0 */
+	{ /* class_tid: 3, wh_plus, table: parif_def_arec_ptr.egr_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
 	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
 	.direction = TF_DIR_TX,
@@ -1123,17 +1239,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 30,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 325,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 356,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
-	{ /* class_tid: 4, wh_plus, table: parif_def_err_arec_ptr.0 */
+	{ /* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.egr_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
 	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
 	.direction = TF_DIR_TX,
@@ -1141,17 +1258,41 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 30,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 326,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 357,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
-	{ /* class_tid: 5, wh_plus, table: l2_cntxt_tcam_cache.rd_egr0 */
+	{ /* class_tid: 4, wh_plus, 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 = 30,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_GLB_REGFILE,
+	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
+	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 358,
+	.result_bit_size = 128,
+	.result_num_fields = 26,
+	.encap_num_fields = 0
+	},
+	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_rd_egr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1160,33 +1301,35 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_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 = 30,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 349,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 415,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.ident_start_idx = 16,
+	.ident_start_idx = 19,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 5, wh_plus, table: control.0 */
+	{ /* class_tid: 4, wh_plus, table: control.vf_0 */
 	.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_OR,
-		.cond_start_idx = 18,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 30,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
-	{ /* class_tid: 5, wh_plus, table: l2_cntxt_tcam_bypass.egr0 */
+	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam.vf_egr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
 	.direction = TF_DIR_TX,
@@ -1194,7 +1337,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 19,
+		.cond_start_idx = 31,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -1203,17 +1346,18 @@ 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 = 350,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 416,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 327,
+	.result_start_idx = 384,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 16,
-	.ident_nums = 0
+	.ident_start_idx = 19,
+	.ident_nums = 1
 	},
-	{ /* class_tid: 5, wh_plus, table: l2_cntxt_tcam_cache.wr_egr0 */
+	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_egr_wr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1222,64 +1366,79 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 19,
+		.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_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 363,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 429,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.result_start_idx = 340,
+	.result_start_idx = 397,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
-	{ /* class_tid: 5, wh_plus, table: int_vtag_encap_record.egr0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	{ /* class_tid: 4, wh_plus, table: parif_def_lkup_arec_ptr.vf_egr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
+	.resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
 	.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 = 19,
+		.cond_start_idx = 31,
 		.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_IF_TBL_OPC_WR_CONST,
+	.tbl_operand = ULP_WP_SYM_LOOPBACK_PARIF,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 344,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 12
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 401,
+	.result_bit_size = 32,
+	.result_num_fields = 1
 	},
-	{ /* class_tid: 5, wh_plus, table: int_full_act_record.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,
+	{ /* class_tid: 4, wh_plus, table: parif_def_arec_ptr.vf_egr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
+	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
 	.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 = 19,
+		.cond_start_idx = 31,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
+	.tbl_operand = ULP_WP_SYM_LOOPBACK_PARIF,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 356,
-	.result_bit_size = 128,
-	.result_num_fields = 26
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 402,
+	.result_bit_size = 32,
+	.result_num_fields = 1
+	},
+	{ /* class_tid: 4, wh_plus, table: parif_def_err_arec_ptr.vf_egr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
+	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
+	.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 = 31,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
+	.tbl_operand = ULP_WP_SYM_LOOPBACK_PARIF,
+	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 403,
+	.result_bit_size = 32,
+	.result_num_fields = 1
 	},
-	{ /* class_tid: 5, wh_plus, table: int_full_act_record.ing0 */
+	{ /* class_tid: 4, wh_plus, 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 =
@@ -1289,18 +1448,20 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 19,
+		.cond_start_idx = 31,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 382,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 404,
 	.result_bit_size = 128,
-	.result_num_fields = 26
+	.result_num_fields = 26,
+	.encap_num_fields = 0
 	},
-	{ /* class_tid: 5, wh_plus, table: l2_cntxt_tcam_bypass.dtagged_ing0 */
+	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vf_ing */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
 	.direction = TF_DIR_RX,
@@ -1308,35 +1469,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 19,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.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 = 364,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 408,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.ident_start_idx = 16,
-	.ident_nums = 0
-	},
-	{ /* class_tid: 5, wh_plus, table: l2_cntxt_tcam_bypass.stagged_ing0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.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 = 19,
+		.cond_start_idx = 31,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -1346,17 +1479,18 @@ 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 = 377,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 430,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 421,
+	.result_start_idx = 430,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 16,
+	.ident_start_idx = 20,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 6, wh_plus, table: l2_cntxt_tcam_cache.rd_egr */
+	{ /* class_tid: 4, wh_plus, 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,
@@ -1365,33 +1499,35 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 19,
+		.cond_start_idx = 31,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 390,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 443,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.ident_start_idx = 16,
+	.ident_start_idx = 20,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 6, wh_plus, table: control.0 */
+	{ /* class_tid: 4, wh_plus, table: control.vfr_0 */
 	.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_OR,
-		.cond_start_idx = 19,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 31,
 		.cond_nums = 1 },
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE
 	},
-	{ /* class_tid: 6, wh_plus, table: l2_cntxt_tcam.egr */
+	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr_egr0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
 	.direction = TF_DIR_TX,
@@ -1399,7 +1535,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 20,
+		.cond_start_idx = 32,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -1408,17 +1544,18 @@ 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 = 391,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 444,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 434,
+	.result_start_idx = 443,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 16,
-	.ident_nums = 1
+	.ident_start_idx = 20,
+	.ident_nums = 0
 	},
-	{ /* class_tid: 6, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */
+	{ /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1427,75 +1564,67 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 20,
+		.cond_start_idx = 32,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 404,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 457,
 	.blob_key_bit_size = 8,
 	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.result_start_idx = 447,
+	.result_start_idx = 456,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
-	{ /* class_tid: 6, wh_plus, table: parif_def_lkup_arec_ptr.egr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
-	.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 = 20,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
-	.tbl_operand = ULP_WP_SYM_LOOPBACK_PARIF,
-	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 451,
-	.result_bit_size = 32,
-	.result_num_fields = 1
-	},
-	{ /* class_tid: 6, wh_plus, table: parif_def_arec_ptr.egr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
+	{ /* class_tid: 4, wh_plus, table: int_vtag_encap_record.vfr_egr0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,
+	.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 = 20,
+		.cond_start_idx = 32,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
-	.tbl_operand = ULP_WP_SYM_LOOPBACK_PARIF,
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 452,
-	.result_bit_size = 32,
-	.result_num_fields = 1
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 460,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 12
 	},
-	{ /* class_tid: 6, wh_plus, table: parif_def_err_arec_ptr.egr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-	.resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
+	{ /* class_tid: 4, wh_plus, 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 = 20,
+		.cond_start_idx = 32,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
-	.tbl_operand = ULP_WP_SYM_LOOPBACK_PARIF,
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 453,
-	.result_bit_size = 32,
-	.result_num_fields = 1
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 472,
+	.result_bit_size = 128,
+	.result_num_fields = 26
 	},
-	{ /* class_tid: 6, wh_plus, table: int_full_act_record.ing */
+	{ /* class_tid: 4, wh_plus, 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 =
@@ -1505,27 +1634,27 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 20,
+		.cond_start_idx = 32,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG,
-	.result_start_idx = 454,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.result_start_idx = 498,
 	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
+	.result_num_fields = 26
 	},
-	{ /* class_tid: 6, wh_plus, table: l2_cntxt_tcam_bypass.ing */
+	{ /* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
 	.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 = 20,
+		.cond_start_idx = 32,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -1535,41 +1664,54 @@ 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 = 405,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 458,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 480,
+	.result_start_idx = 524,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 17,
+	.ident_start_idx = 20,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 7, wh_plus, 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_VFR_CFA_ACTION,
-	.direction = TF_DIR_TX,
+	{ /* class_tid: 4, 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,
+	.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 = 20,
+		.cond_start_idx = 32,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
+	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
 	.accept_opcode = BNXT_ULP_ACCEPT_OPC_ALWAYS,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.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,
-	.result_start_idx = 493,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
+	.byte_order = BNXT_ULP_BYTE_ORDER_LE,
+	.key_start_idx = 471,
+	.blob_key_bit_size = 167,
+	.key_bit_size = 167,
+	.key_num_fields = 13,
+	.result_start_idx = 537,
+	.result_bit_size = 64,
+	.result_num_fields = 13,
+	.ident_start_idx = 20,
+	.ident_nums = 0
 	}
 };
 
 struct bnxt_ulp_mapper_cond_info ulp_wh_plus_class_cond_list[] = {
+	/* cond_reject: wh_plus, class_tid: 1 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
+	.cond_operand = BNXT_ULP_CF_IDX_WC_MATCH
+	},
 	/* cond_execute: class_tid: 1, l2_cntxt_tcam_cache.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_FIELD_BIT_NOT_SET,
@@ -1590,16 +1732,65 @@ struct bnxt_ulp_mapper_cond_info ulp_wh_plus_class_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
 	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
 	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_NOT_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: class_tid: 1, profile_tcam.ipv6 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_NOT_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: class_tid: 1, profile_tcam.vxlan */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
 	/* cond_execute: class_tid: 1, em.ipv4 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
 	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
 	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_NOT_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
 	/* cond_execute: class_tid: 1, eem.ipv4 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
 	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
 	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_NOT_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: class_tid: 1, em.ipv6 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_NOT_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: class_tid: 1, eem.ipv6 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_NOT_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_reject: wh_plus, class_tid: 2 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
+	.cond_operand = BNXT_ULP_CF_IDX_WC_MATCH
+	},
 	/* cond_execute: class_tid: 2, l2_cntxt_tcam_cache.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_FIELD_BIT_NOT_SET,
@@ -1630,27 +1821,27 @@ struct bnxt_ulp_mapper_cond_info ulp_wh_plus_class_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
 	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
 	},
-	/* cond_execute: class_tid: 3, control.0 */
+	/* cond_execute: class_tid: 3, control.ing_0 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
 	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
 	},
-	/* cond_execute: class_tid: 4, control.0 */
+	/* cond_execute: class_tid: 3, control.egr_0 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
 	.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE
 	},
-	/* cond_execute: class_tid: 4, control.1 */
+	/* cond_execute: class_tid: 3, control.egr_1 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
 	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
 	},
-	/* cond_execute: class_tid: 4, control.2 */
+	/* cond_execute: class_tid: 3, control.egr_2 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
 	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
 	},
-	/* cond_execute: class_tid: 4, l2_cntxt_tcam_cache.wr */
+	/* cond_execute: class_tid: 3, l2_cntxt_tcam_cache.egr_wr */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_CF_NOT_SET,
 	.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE
@@ -1659,12 +1850,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.0 */
+	/* cond_execute: class_tid: 4, control.vf_0 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
 	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
 	},
-	/* cond_execute: class_tid: 6, control.0 */
+	/* cond_execute: class_tid: 4, control.vfr_0 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
 	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
@@ -1946,9 +2137,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -1966,7 +2155,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -2794,9 +2983,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "recycle_cnt",
@@ -2828,9 +3015,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "pkt_type_1",
@@ -2848,7 +3033,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -3565,9 +3750,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "recycle_cnt",
@@ -3599,9 +3782,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "pkt_type_1",
@@ -3619,7 +3800,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -3631,20 +3812,18 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			1}
 		}
 	},
-	/* class_tid: 1, wh_plus, table: profile_tcam_cache.wr */
+	/* class_tid: 1, wh_plus, table: profile_tcam.vxlan */
 	{
 	.field_info_mask = {
-		.description = "recycle_cnt",
-		.field_bit_size = 2,
+		.description = "l4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "recycle_cnt",
-		.field_bit_size = 2,
+		.description = "l4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -3652,8 +3831,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "prof_func_id",
-		.field_bit_size = 7,
+		.description = "l4_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
@@ -3661,27 +3840,19 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "prof_func_id",
-		.field_bit_size = 7,
+		.description = "l4_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
-		.field_cond_opr = {
-			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,
-			BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
-			BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
+			ULP_WP_SYM_L4_HDR_TYPE_UDP}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.description = "l4_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
@@ -3689,28 +3860,24 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.description = "l4_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-			(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
-			BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
-	/* class_tid: 1, wh_plus, table: em.ipv4 */
 	{
 	.field_info_mask = {
-		.description = "spare",
-		.field_bit_size = 3,
+		.description = "l4_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "spare",
-		.field_bit_size = 3,
+		.description = "l4_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -3718,15 +3885,15 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "local_cos",
-		.field_bit_size = 3,
+		.description = "l3_ipv6_cmp_dst",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "local_cos",
-		.field_bit_size = 3,
+		.description = "l3_ipv6_cmp_dst",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -3734,111 +3901,47 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
-		.field_bit_size = 16,
+		.description = "l3_ipv6_cmp_src",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
-		.field_bit_size = 16,
+		.description = "l3_ipv6_cmp_src",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
-		.field_bit_size = 16,
+		.description = "l3_hdr_isIP",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
-		.field_bit_size = 16,
+		.description = "l3_hdr_isIP",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.ip_proto",
-		.field_bit_size = 8,
+		.description = "l3_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.ip_proto",
-		.field_bit_size = 8,
+		.description = "l3_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -3846,125 +3949,97 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.dst",
-		.field_bit_size = 32,
+		.description = "l3_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.dst",
-		.field_bit_size = 32,
+		.description = "l3_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.src",
-		.field_bit_size = 32,
+		.description = "l3_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.src",
-		.field_bit_size = 32,
+		.description = "l3_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.smac",
-		.field_bit_size = 48,
+		.description = "l2_two_vtags",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.smac",
-		.field_bit_size = 48,
+		.description = "l2_two_vtags",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_cntxt_id",
-		.field_bit_size = 10,
+		.description = "l2_vtag_present",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff,
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_cntxt_id",
-		.field_bit_size = 10,
+		.description = "l2_vtag_present",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "em_profile_id",
-		.field_bit_size = 8,
+		.description = "l2_uc_mc_bc",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "em_profile_id",
-		.field_bit_size = 8,
+		.description = "l2_uc_mc_bc",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
-	/* class_tid: 1, wh_plus, table: eem.ipv4 */
 	{
 	.field_info_mask = {
-		.description = "spare",
-		.field_bit_size = 275,
+		.description = "l2_hdr_type",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "spare",
-		.field_bit_size = 275,
+		.description = "l2_hdr_type",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -3972,15 +4047,15 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "local_cos",
-		.field_bit_size = 3,
+		.description = "l2_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "local_cos",
-		.field_bit_size = 3,
+		.description = "l2_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -3988,180 +4063,1492 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
-		.field_bit_size = 16,
+		.description = "l2_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_flags",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_flags",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_err",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_err",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			ULP_WP_SYM_TUN_HDR_VALID_YES}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl4_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl4_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl4_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl4_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl4_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "tl4_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			ULP_WP_SYM_TL4_HDR_VALID_YES}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_ipv6_cmp_dst",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_hdr_isIP",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl3_hdr_isIP",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl3_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl3_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "tl3_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			ULP_WP_SYM_TL3_HDR_VALID_YES}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_two_vtags",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_two_vtags",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_vtag_present",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_vtag_present",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "tl2_uc_mc_bc",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_hdr_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_hdr_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "tl2_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			ULP_WP_SYM_TL2_HDR_VALID_YES}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "hrec_next",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "hrec_next",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "reserved",
+		.field_bit_size = 9,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "reserved",
+		.field_bit_size = 9,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "prof_func_id",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "prof_func_id",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,
+			BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "agg_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "agg_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "pkt_type_0",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "pkt_type_0",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "pkt_type_1",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "pkt_type_1",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			1}
+		}
+	},
+	/* class_tid: 1, wh_plus, table: profile_tcam_cache.wr */
+	{
+	.field_info_mask = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "prof_func_id",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "prof_func_id",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,
+			BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
+		.field_opr2 = {
+			(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
+			BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "hdr_sig_id",
+		.field_bit_size = 5,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "hdr_sig_id",
+		.field_bit_size = 5,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
+		}
+	},
+	/* class_tid: 1, wh_plus, table: em.ipv4 */
+	{
+	.field_info_mask = {
+		.description = "spare",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "spare",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l4.dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l4.dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
+		.field_cond_opr = {
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l4.src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l4.src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
+		.field_cond_opr = {
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3.prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l3.prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3.dst",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l3.dst",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3.src",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l3.src",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2.smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2.smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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}
+		}
+	},
+	/* class_tid: 1, wh_plus, table: eem.ipv4 */
+	{
+	.field_info_mask = {
+		.description = "spare",
+		.field_bit_size = 275,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "spare",
+		.field_bit_size = 275,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l4.dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l4.dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
+		.field_cond_opr = {
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l4.src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l4.src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
+		.field_cond_opr = {
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3.prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l3.prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3.dst",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l3.dst",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3.src",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l3.src",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2.smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2.smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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}
+		}
+	},
+	/* class_tid: 1, wh_plus, table: em.ipv6 */
+	{
+	.field_info_mask = {
+		.description = "spare",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "spare",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l4.dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l4.dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
+		.field_cond_opr = {
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l4.src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l4.src",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
+		.field_cond_opr = {
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3.prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l3.prot",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3.dst",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l3.dst",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3.src",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l3.src",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2.smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_opr1 = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2.smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2.dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2.dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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}
+		}
+	},
+	/* class_tid: 1, wh_plus, table: eem.ipv6 */
+	{
+	.field_info_mask = {
+		.description = "spare",
+		.field_bit_size = 35,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "spare",
+		.field_bit_size = 35,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l4.dst",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
+		.description = "l4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.dst",
-		.field_bit_size = 32,
+		.description = "l3.dst",
+		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.dst",
-		.field_bit_size = 32,
+		.description = "l3.dst",
+		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.src",
-		.field_bit_size = 32,
+		.description = "l3.src",
+		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.src",
-		.field_bit_size = 32,
+		.description = "l3.src",
+		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.smac",
+		.description = "l2.smac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.smac",
+		.description = "l2.smac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2.dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2.dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -4207,7 +5594,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
 		}
 	},
-	/* class_tid: 1, wh_plus, table: em.ipv6 */
+	/* class_tid: 1, wh_plus, table: em.vxlan */
 	{
 	.field_info_mask = {
 		.description = "spare",
@@ -4242,110 +5629,46 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
+		.description = "tl4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
+		.description = "tl4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
+		.description = "tl4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
+		.description = "tl4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.ip_proto",
+		.description = "tl3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.ip_proto",
+		.description = "tl3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
@@ -4354,81 +5677,69 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.dst",
-		.field_bit_size = 128,
+		.description = "tl3.dst",
+		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.dst",
-		.field_bit_size = 128,
+		.description = "tl3.dst",
+		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.src",
-		.field_bit_size = 128,
+		.description = "tl3.src",
+		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.src",
-		.field_bit_size = 128,
+		.description = "tl3.src",
+		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.smac",
+		.description = "tl2.src",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.smac",
+		.description = "tl2.src",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.dmac",
-		.field_bit_size = 48,
+		.description = "tun_id",
+		.field_bit_size = 24,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.dmac",
-		.field_bit_size = 48,
+		.description = "tun_id",
+		.field_bit_size = 24,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -4477,18 +5788,18 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
 		}
 	},
-	/* class_tid: 1, wh_plus, table: eem.ipv6 */
+	/* class_tid: 1, wh_plus, table: eem.vxlan */
 	{
 	.field_info_mask = {
 		.description = "spare",
-		.field_bit_size = 35,
+		.field_bit_size = 251,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "spare",
-		.field_bit_size = 35,
+		.field_bit_size = 251,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -4512,110 +5823,46 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
+		.description = "tl4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
+		.description = "tl4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
+		.description = "tl4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
+		.description = "tl4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.ip_proto",
+		.description = "tl3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.ip_proto",
+		.description = "tl3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
@@ -4624,81 +5871,69 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.dst",
-		.field_bit_size = 128,
+		.description = "tl3.dst",
+		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.dst",
-		.field_bit_size = 128,
+		.description = "tl3.dst",
+		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.src",
-		.field_bit_size = 128,
+		.description = "tl3.src",
+		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.src",
-		.field_bit_size = 128,
+		.description = "tl3.src",
+		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.smac",
+		.description = "tl2.src",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.smac",
+		.description = "tl2.src",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.dmac",
-		.field_bit_size = 48,
+		.description = "tun_id",
+		.field_bit_size = 24,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.dmac",
-		.field_bit_size = 48,
+		.description = "tun_id",
+		.field_bit_size = 24,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -5021,9 +6256,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -5041,7 +6274,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -5869,9 +7102,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "recycle_cnt",
@@ -5903,9 +7134,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "pkt_type_1",
@@ -5923,7 +7152,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -6640,9 +7869,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "recycle_cnt",
@@ -6674,9 +7901,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "pkt_type_1",
@@ -6694,7 +7919,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -6809,180 +8034,165 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
+		.description = "l4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
+		.description = "l4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.dst",
+		.description = "l3.dst",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.dst",
+		.description = "l3.dst",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.src",
+		.description = "l3.src",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.src",
+		.description = "l3.src",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.dmac",
+		.description = "l2.dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.dmac",
+		.description = "l2.dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -7063,180 +8273,165 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
+		.description = "l4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
+		.description = "l4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.dst",
+		.description = "l3.dst",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.dst",
+		.description = "l3.dst",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv4.src",
+		.description = "l3.src",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv4.src",
+		.description = "l3.src",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.dmac",
+		.description = "l2.dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.dmac",
+		.description = "l2.dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -7317,170 +8512,147 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
+		.description = "l4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
+		.description = "l4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.dst",
+		.description = "l3.dst",
 		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.dst",
+		.description = "l3.dst",
 		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.src",
+		.description = "l3.src",
 		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.src",
+		.description = "l3.src",
 		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.smac",
+		.description = "l2.smac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.smac",
+		.description = "l2.smac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
@@ -7489,24 +8661,32 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.dmac",
+		.description = "l2.dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.dmac",
+		.description = "l2.dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -7587,170 +8767,147 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.dport",
+		.description = "l4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.dport",
+		.description = "l4.dst",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
-		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_l4.sport",
+		.description = "l4.src",
 		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_HDR_BIT,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_CF,
 		.field_cond_opr = {
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-			((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-			(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+			(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4 & 0xff},
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-			(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
-		.field_src2 = BNXT_ULP_FIELD_SRC_HF,
-		.field_opr2 = {
-			(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+			(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.ip_proto",
+		.description = "l3.prot",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+			(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.dst",
+		.description = "l3.dst",
 		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.dst",
+		.description = "l3.dst",
 		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_ipv6.src",
+		.description = "l3.src",
 		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_ipv6.src",
+		.description = "l3.src",
 		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.smac",
+		.description = "l2.smac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.smac",
+		.description = "l2.smac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
@@ -7759,24 +8916,32 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "o_eth.dmac",
+		.description = "l2.dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "o_eth.dmac",
+		.description = "l2.dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_FIELD_BIT,
+		.field_cond_opr = {
+			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
 		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
 		.field_opr1 = {
 			(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+			BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+		.field_src2 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -7822,7 +8987,29 @@ 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, wh_plus, table: l2_cntxt_tcam_cache.rd */
+	/* class_tid: 3, wh_plus, table: port_table.wr */
+	{
+	.field_info_mask = {
+		.description = "dev.port_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "dev.port_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.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: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_rd */
 	{
 	.field_info_mask = {
 		.description = "svif",
@@ -7844,7 +9031,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			BNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.0 */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.ing_0 */
 	{
 	.field_info_mask = {
 		.description = "l2_ivlan_vid",
@@ -8032,9 +9219,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -8052,7 +9237,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -8064,7 +9249,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			1}
 		}
 	},
-	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.wr */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_wr */
 	{
 	.field_info_mask = {
 		.description = "svif",
@@ -8086,7 +9271,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			BNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.rd_vfr */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_rd_vfr */
 	{
 	.field_info_mask = {
 		.description = "svif",
@@ -8108,7 +9293,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_bypass.egr_vfr */
 	{
 	.field_info_mask = {
 		.description = "l2_ivlan_vid",
@@ -8296,9 +9481,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -8316,7 +9499,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -8328,7 +9511,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			1}
 		}
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.wr_vfr */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr_vfr */
 	{
 	.field_info_mask = {
 		.description = "svif",
@@ -8350,7 +9533,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.rd */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.rd */
 	{
 	.field_info_mask = {
 		.description = "svif",
@@ -8372,7 +9555,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam.0 */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.egr_0 */
 	{
 	.field_info_mask = {
 		.description = "l2_ivlan_vid",
@@ -8560,9 +9743,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -8580,7 +9761,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -8592,7 +9773,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			1}
 		}
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.wr */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */
 	{
 	.field_info_mask = {
 		.description = "svif",
@@ -8614,7 +9795,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 5, wh_plus, table: l2_cntxt_tcam_cache.rd_egr0 */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_rd_egr */
 	{
 	.field_info_mask = {
 		.description = "svif",
@@ -8632,11 +9813,11 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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}
+			(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 5, wh_plus, table: l2_cntxt_tcam_bypass.egr0 */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam.vf_egr */
 	{
 	.field_info_mask = {
 		.description = "l2_ivlan_vid",
@@ -8702,8 +9883,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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}
+			(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
 		}
 	},
 	{
@@ -8824,9 +10005,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -8844,7 +10023,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -8856,7 +10035,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			1}
 		}
 	},
-	/* class_tid: 5, wh_plus, table: l2_cntxt_tcam_cache.wr_egr0 */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_egr_wr */
 	{
 	.field_info_mask = {
 		.description = "svif",
@@ -8874,11 +10053,11 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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}
+			(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 5, wh_plus, table: l2_cntxt_tcam_bypass.dtagged_ing0 */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vf_ing */
 	{
 	.field_info_mask = {
 		.description = "l2_ivlan_vid",
@@ -8901,20 +10080,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 12,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff,
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l2_ovlan_vid",
 		.field_bit_size = 12,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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
 		}
 	},
 	{
@@ -8950,8 +10123,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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}
+			(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
 		}
 	},
 	{
@@ -9024,18 +10197,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l2_num_vtags",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			2}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -9060,18 +10229,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tun_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -9080,9 +10245,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -9100,7 +10263,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -9112,27 +10275,43 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			1}
 		}
 	},
-	/* class_tid: 5, wh_plus, table: l2_cntxt_tcam_bypass.stagged_ing0 */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_rd_egr0 */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "svif",
+		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "svif",
+		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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_DRV_FUNC_SVIF >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
+		}
+	},
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr_egr0 */
+	{
+	.field_info_mask = {
+		.description = "l2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -9258,18 +10437,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "l2_num_vtags",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -9294,18 +10469,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "tun_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -9314,9 +10485,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -9334,7 +10503,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -9346,7 +10515,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			1}
 		}
 	},
-	/* class_tid: 6, wh_plus, table: l2_cntxt_tcam_cache.rd_egr */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
 	{
 	.field_info_mask = {
 		.description = "svif",
@@ -9364,11 +10533,11 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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}
+			(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 6, wh_plus, table: l2_cntxt_tcam.egr */
+	/* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
 	{
 	.field_info_mask = {
 		.description = "l2_ivlan_vid",
@@ -9391,14 +10560,20 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 12,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
 		.description = "l2_ovlan_vid",
 		.field_bit_size = 12,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.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}
 		}
 	},
 	{
@@ -9434,8 +10609,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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}
+			(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
 		}
 	},
 	{
@@ -9508,14 +10683,18 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
 		.description = "l2_num_vtags",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			2}
 		}
 	},
 	{
@@ -9540,14 +10719,18 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
 		.description = "tun_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			ULP_WP_SYM_TUN_HDR_TYPE_NONE}
 		}
 	},
 	{
@@ -9556,9 +10739,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -9576,7 +10757,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -9588,43 +10769,27 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 			1}
 		}
 	},
-	/* class_tid: 6, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */
+	/* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l2_ivlan_vid",
+		.field_bit_size = 12,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
-	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
-		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.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}
-		}
-	},
-	/* class_tid: 6, wh_plus, table: l2_cntxt_tcam_bypass.ing */
-	{
-	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
-		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-		},
 	.field_info_spec = {
 		.description = "l2_ivlan_vid",
 		.field_bit_size = 12,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.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}
 		}
 	},
 	{
@@ -9676,8 +10841,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.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}
+			(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
+			BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
 		}
 	},
 	{
@@ -9750,14 +10915,18 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
 		.description = "l2_num_vtags",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			1}
 		}
 	},
 	{
@@ -9782,14 +10951,18 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
 		.description = "tun_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			ULP_WP_SYM_TUN_HDR_TYPE_NONE}
 		}
 	},
 	{
@@ -9798,9 +10971,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "key_type",
@@ -9818,7 +10989,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 		.field_opr1 = {
-			0xff}
+			1}
 		},
 	.field_info_spec = {
 		.description = "valid",
@@ -9833,38 +11004,6 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 };
 
 struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
-	/* class_tid: 1, wh_plus, table: mac_addr_cache.rd */
-	{
-	.description = "rid",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l2_cntxt_tcam_index",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
 	/* class_tid: 1, wh_plus, table: l2_cntxt_tcam.0 */
 	{
 	.description = "l2_cntxt_id",
@@ -9970,43 +11109,190 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	},
 	/* class_tid: 1, wh_plus, table: mac_addr_cache.wr */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* class_tid: 1, wh_plus, table: profile_tcam.ipv4 */
+	{
+	.description = "wc_key_id",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "wc_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "wc_search_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "em_key_mask.0",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
+	},
+	{
+	.description = "em_key_mask.1",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
+	.field_opr1 = {
+		(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+		BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+	},
+	{
+	.description = "em_key_mask.2",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
+	.field_opr1 = {
+		(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+		BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+	},
+	{
+	.description = "em_key_mask.3",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
+	.field_opr1 = {
+		(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+		BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+	},
+	{
+	.description = "em_key_mask.4",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID & 0xff}
+	},
+	{
+	.description = "em_key_mask.5",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 0xff}
+	},
+	{
+	.description = "em_key_mask.6",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 0xff}
+	},
+	{
+	.description = "em_key_mask.7",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "em_key_mask.8",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "em_key_mask.9",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "em_key_id",
+	.field_bit_size = 5,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-		BNXT_ULP_RF_IDX_RID & 0xff}
+		3}
 	},
 	{
-	.description = "l2_cntxt_tcam_index",
-	.field_bit_size = 10,
+	.description = "em_profile_id",
+	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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}
+		(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
 	},
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "em_search_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+		1}
 	},
 	{
-	.description = "src_property_ptr",
-	.field_bit_size = 10,
+	.description = "pl_byp_lkup_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 1, wh_plus, table: profile_tcam.ipv4 */
+	/* class_tid: 1, wh_plus, table: profile_tcam.ipv6 */
 	{
 	.description = "wc_key_id",
 	.field_bit_size = 4,
@@ -10042,10 +11328,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-	.field_opr1 = {
-		(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-		BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "em_key_mask.2",
@@ -10054,8 +11337,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
 	.field_opr1 = {
-		(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
-		BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+		(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
+		BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
 	},
 	{
 	.description = "em_key_mask.3",
@@ -10064,15 +11347,18 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
 	.field_opr1 = {
-		(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
-		BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+		(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
+		BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
 	},
 	{
 	.description = "em_key_mask.4",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
+	.field_opr1 = {
+		(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
+		BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
 	},
 	{
 	.description = "em_key_mask.5",
@@ -10081,8 +11367,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 0xff}
+		(BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID & 0xff}
 	},
 	{
 	.description = "em_key_mask.6",
@@ -10091,15 +11377,18 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 0xff}
+		(BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 0xff}
 	},
 	{
 	.description = "em_key_mask.7",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 0xff}
 	},
 	{
 	.description = "em_key_mask.8",
@@ -10122,7 +11411,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		3}
+		7}
 	},
 	{
 	.description = "em_profile_id",
@@ -10150,7 +11439,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 1, wh_plus, table: profile_tcam.ipv6 */
+	/* class_tid: 1, wh_plus, table: profile_tcam.vxlan */
 	{
 	.description = "wc_key_id",
 	.field_bit_size = 4,
@@ -10193,30 +11482,23 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-	.field_opr1 = {
-		(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,
-		BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "em_key_mask.3",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-	.field_opr1 = {
-		(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,
-		BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "em_key_mask.4",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,
-		BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}
+		1}
 	},
 	{
 	.description = "em_key_mask.5",
@@ -10230,20 +11512,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "em_key_mask.7",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "em_key_mask.8",
@@ -10266,7 +11542,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		7}
+		20}
 	},
 	{
 	.description = "em_profile_id",
@@ -10638,38 +11914,154 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opr1 = {
 		1}
 	},
-	/* class_tid: 2, wh_plus, table: mac_addr_cache.rd */
+	/* class_tid: 1, wh_plus, table: em.vxlan */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
+	.description = "act_rec_ptr",
+	.field_bit_size = 33,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_cntxt_tcam_index",
-	.field_bit_size = 10,
+	.description = "act_rec_int",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "act_rec_size",
+	.field_bit_size = 5,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "key_size",
+	.field_bit_size = 9,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "strength",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		3}
+	},
+	{
+	.description = "l1_cacheable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
+	},
+	/* class_tid: 1, wh_plus, table: eem.vxlan */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 33,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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}
 	},
 	{
-	.description = "src_property_ptr",
-	.field_bit_size = 10,
+	.description = "ext_flow_cntr",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "act_rec_int",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "act_rec_size",
+	.field_bit_size = 5,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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}
+	},
+	{
+	.description = "key_size",
+	.field_bit_size = 9,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		(197 >> 8) & 0xff,
+		197 & 0xff}
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "strength",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		3}
+	},
+	{
+	.description = "l1_cacheable",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	{
+	.description = "valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
+	},
 	/* class_tid: 2, wh_plus, table: l2_cntxt_tcam.0 */
 	{
 	.description = "l2_cntxt_id",
@@ -10886,7 +12278,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID & 0xff}
 	},
 	{
 	.description = "em_key_mask.5",
@@ -11037,7 +12432,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_O_L3_FB_PROTO_ID & 0xff}
 	},
 	{
 	.description = "em_key_mask.6",
@@ -11450,9 +12848,51 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		1}
+		1}
+	},
+	/* class_tid: 3, wh_plus, table: port_table.wr */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "drv_func.mac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_PORT_TABLE,
+	.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_opr2 = {
+		(BNXT_ULP_PORT_TABLE_DRV_FUNC_MAC >> 8) & 0xff,
+		BNXT_ULP_PORT_TABLE_DRV_FUNC_MAC & 0xff}
+	},
+	{
+	.description = "drv_func.parent.mac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_PORT_TABLE,
+	.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_opr2 = {
+		(BNXT_ULP_PORT_TABLE_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
+		BNXT_ULP_PORT_TABLE_DRV_FUNC_PARENT_MAC & 0xff}
+	},
+	{
+	.description = "default_arec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+		(BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
 	},
-	/* class_tid: 3, wh_plus, table: int_full_act_record.0 */
+	/* class_tid: 3, wh_plus, table: int_full_act_record.ing_0 */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -11638,7 +13078,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.0 */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.ing_0 */
 	{
 	.description = "l2_cntxt_id",
 	.field_bit_size = 10,
@@ -11741,7 +13181,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.wr */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_wr */
 	{
 	.description = "rid",
 	.field_bit_size = 32,
@@ -11779,7 +13219,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.0 */
+	/* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.ing_0 */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 32,
@@ -11790,7 +13230,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 		(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
 		BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
-	/* class_tid: 3, wh_plus, table: parif_def_arec_ptr.0 */
+	/* class_tid: 3, wh_plus, table: parif_def_arec_ptr.ing_0 */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 32,
@@ -11801,7 +13241,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 		(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
 		BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
-	/* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.0 */
+	/* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.ing_0 */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 32,
@@ -11812,7 +13252,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 		(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
 		BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
-	/* class_tid: 4, wh_plus, table: int_full_act_record.vfr */
+	/* class_tid: 3, wh_plus, table: int_full_act_record.egr_vfr */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -11998,7 +13438,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_bypass.egr_vfr */
 	{
 	.description = "act_record_ptr",
 	.field_bit_size = 16,
@@ -12099,7 +13539,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.wr_vfr */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr_vfr */
 	{
 	.description = "rid",
 	.field_bit_size = 32,
@@ -12134,7 +13574,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam.0 */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.egr_0 */
 	{
 	.description = "l2_cntxt_id",
 	.field_bit_size = 10,
@@ -12237,7 +13677,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.wr */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */
 	{
 	.description = "rid",
 	.field_bit_size = 32,
@@ -12275,7 +13715,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, wh_plus, table: int_full_act_record.0 */
+	/* class_tid: 3, wh_plus, table: int_full_act_record.egr_0 */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -12461,7 +13901,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, wh_plus, table: parif_def_lkup_arec_ptr.0 */
+	/* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.egr_0 */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 32,
@@ -12472,7 +13912,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 		(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
 		BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
-	/* class_tid: 4, wh_plus, table: parif_def_arec_ptr.0 */
+	/* class_tid: 3, wh_plus, table: parif_def_arec_ptr.egr_0 */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 32,
@@ -12483,7 +13923,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 		(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
 		BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
-	/* class_tid: 4, wh_plus, table: parif_def_err_arec_ptr.0 */
+	/* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.egr_0 */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 32,
@@ -12494,424 +13934,366 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 		(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
 		BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
-	/* class_tid: 5, wh_plus, table: l2_cntxt_tcam_bypass.egr0 */
+	/* class_tid: 4, wh_plus, table: int_full_act_record.loopback */
 	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "reserved",
+	.description = "age_enable",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "agg_cntr_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
-	},
-	{
-	.description = "parif",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
+	.description = "tcpflags_mir",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
-	},
-	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
+	.description = "tcpflags_match",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "encap_ptr",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, wh_plus, table: l2_cntxt_tcam_cache.wr_egr0 */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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",
+	.description = "dst_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_property_ptr",
+	.description = "src_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, wh_plus, table: int_vtag_encap_record.egr0 */
 	{
-	.description = "ecv_tun_type",
-	.field_bit_size = 3,
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l4_type",
-	.field_bit_size = 3,
+	.description = "meter_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l3_type",
-	.field_bit_size = 3,
+	.description = "l3_rdir",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l2_en",
+	.description = "tl3_rdir",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_vtag_type",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		ULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
-	},
-	{
-	.description = "ecv_custom_en",
+	.description = "l3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_valid",
+	.description = "tl3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_tpid",
-	.field_bit_size = 16,
+	.description = "decap_func",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		0x81,
-		0x00}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_vid",
+	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
+		(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
+		ULP_WP_SYM_LOOPBACK_PORT & 0xff}
 	},
 	{
-	.description = "vtag_de",
+	.description = "pop_vlan",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "spare",
-	.field_bit_size = 80,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* class_tid: 5, wh_plus, table: int_full_act_record.egr0 */
-	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
+	.description = "meter",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "age_enable",
-	.field_bit_size = 1,
+	.description = "mirror",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "agg_cntr_en",
+	.description = "drop",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "rate_cntr_en",
+	.description = "hit",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "flow_cntr_en",
+	.description = "type",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam.vf_egr */
 	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_mir",
-	.field_bit_size = 1,
+	.description = "prof_func_id",
+	.field_bit_size = 7,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "tcpflags_match",
+	.description = "l2_byp_lkup_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
+	.description = "parif",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.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_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
+	.description = "bd_act_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_ttl_dec",
+	.description = "byp_sp_lkup",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_egr_wr */
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.description = "rid",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-		(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
-		ULP_WP_SYM_LOOPBACK_PORT & 0xff}
+		(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.description = "pop_vlan",
-	.field_bit_size = 1,
+	.description = "l2_cntxt_tcam_index",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.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 = "meter",
-	.field_bit_size = 1,
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "mirror",
-	.field_bit_size = 2,
+	.description = "src_property_ptr",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 4, wh_plus, table: parif_def_lkup_arec_ptr.vf_egr */
 	{
-	.description = "drop",
-	.field_bit_size = 1,
+	.description = "act_rec_ptr",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.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: 4, wh_plus, table: parif_def_arec_ptr.vf_egr */
 	{
-	.description = "hit",
-	.field_bit_size = 1,
+	.description = "act_rec_ptr",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.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: 4, wh_plus, table: parif_def_err_arec_ptr.vf_egr */
 	{
-	.description = "type",
-	.field_bit_size = 1,
+	.description = "act_rec_ptr",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.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, wh_plus, table: int_full_act_record.ing0 */
+	/* class_tid: 4, wh_plus, table: int_full_act_record.vf_ing */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -13052,17 +14434,15 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 	.field_opr1 = {
-		(BNXT_ULP_CF_IDX_VF_FUNC_VNIC >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_VF_FUNC_VNIC & 0xff}
+		(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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-		1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter",
@@ -13099,7 +14479,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, wh_plus, table: l2_cntxt_tcam_bypass.dtagged_ing0 */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vf_ing */
 	{
 	.description = "act_record_ptr",
 	.field_bit_size = 16,
@@ -13198,16 +14578,13 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, wh_plus, table: l2_cntxt_tcam_bypass.stagged_ing0 */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr_egr0 */
 	{
 	.description = "act_record_ptr",
 	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "reserved",
@@ -13265,7 +14642,9 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
 	.description = "sp_rec_ptr",
@@ -13297,180 +14676,326 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 6, wh_plus, table: l2_cntxt_tcam.egr */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "rid",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_RID >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.description = "prof_func_id",
-	.field_bit_size = 7,
+	.description = "l2_cntxt_tcam_index",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_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_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_property_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* class_tid: 4, wh_plus, table: int_vtag_encap_record.vfr_egr0 */
+	{
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l2_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
+	.description = "ecv_vtag_type",
 	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		ULP_WP_SYM_LOOPBACK_PARIF}
+		ULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
+	},
+	{
+	.description = "vtag_tpid",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x81,
+		0x00}
+	},
+	{
+	.description = "vtag_vid",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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}
+	},
+	{
+	.description = "vtag_de",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_pcp",
 	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "spare",
+	.field_bit_size = 80,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* class_tid: 4, wh_plus, table: int_full_act_record.vfr_egr0 */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.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_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
+	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
+	.description = "l3_rdir",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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 = "tl3_ttl_dec",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "decap_func",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 6, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-		BNXT_ULP_RF_IDX_RID & 0xff}
+		(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
+		ULP_WP_SYM_LOOPBACK_PORT & 0xff}
 	},
 	{
-	.description = "l2_cntxt_tcam_index",
-	.field_bit_size = 10,
+	.description = "pop_vlan",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "meter",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_property_ptr",
-	.field_bit_size = 10,
+	.description = "mirror",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 6, wh_plus, table: parif_def_lkup_arec_ptr.egr */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "drop",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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: 6, wh_plus, table: parif_def_arec_ptr.egr */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "hit",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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: 6, wh_plus, table: parif_def_err_arec_ptr.egr */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "type",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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: 6, wh_plus, table: int_full_act_record.ing */
+	/* class_tid: 4, wh_plus, table: int_full_act_record.vfr_ing0 */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -13611,15 +15136,17 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.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_VF_FUNC_VNIC >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_VF_FUNC_VNIC & 0xff}
 	},
 	{
 	.description = "pop_vlan",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
 	.description = "meter",
@@ -13656,7 +15183,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 6, wh_plus, table: l2_cntxt_tcam_bypass.ing */
+	/* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
 	{
 	.description = "act_record_ptr",
 	.field_bit_size = 16,
@@ -13755,188 +15282,101 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 7, wh_plus, table: int_full_act_record.0 */
-	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
+	/* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
 	{
-	.description = "age_enable",
-	.field_bit_size = 1,
+	.description = "act_record_ptr",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.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}
 	},
 	{
-	.description = "agg_cntr_en",
+	.description = "reserved",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "rate_cntr_en",
+	.description = "l2_byp_lkup_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		1}
 	},
 	{
-	.description = "flow_cntr_en",
-	.field_bit_size = 1,
+	.description = "parif",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_key",
+	.description = "allowed_pri",
 	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_mir",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_match",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
+	.description = "default_pri",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "allowed_tpid",
+	.field_bit_size = 6,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
-	.field_bit_size = 1,
+	.description = "default_tpid",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_rdir",
+	.description = "bd_act_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_ttl_dec",
-	.field_bit_size = 1,
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "byp_sp_lkup",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "decap_func",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		(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_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "meter",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		1}
 	},
 	{
-	.description = "mirror",
+	.description = "pri_anti_spoof_ctl",
 	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "hit",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
-	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "type",
-	.field_bit_size = 1,
+	.description = "tpid_anti_spoof_ctl",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_COND_OP,
 	.field_cond_src = BNXT_ULP_FIELD_COND_SRC_TRUE,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -13951,6 +15391,13 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
 	.ident_bit_size = 10,
 	.ident_bit_pos = 42
 	},
+	/* class_tid: 1, wh_plus, table: mac_addr_cache.rd */
+	{
+	.description = "l2_cntxt_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
+	.ident_bit_size = 10,
+	.ident_bit_pos = 42
+	},
 	/* class_tid: 1, wh_plus, table: l2_cntxt_tcam.0 */
 	{
 	.description = "l2_cntxt_id",
@@ -13997,6 +15444,15 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
 	.ident_bit_size = 8,
 	.ident_bit_pos = 28
 	},
+	/* class_tid: 1, wh_plus, table: profile_tcam.vxlan */
+	{
+	.description = "em_profile_id",
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.ident_type = TF_IDENT_TYPE_EM_PROF,
+	.regfile_idx = BNXT_ULP_RF_IDX_EM_PROFILE_ID_0,
+	.ident_bit_size = 8,
+	.ident_bit_pos = 28
+	},
 	/* class_tid: 2, wh_plus, table: l2_cntxt_tcam_cache.rd */
 	{
 	.description = "l2_cntxt_id",
@@ -14004,6 +15460,13 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
 	.ident_bit_size = 10,
 	.ident_bit_pos = 42
 	},
+	/* class_tid: 2, wh_plus, table: mac_addr_cache.rd */
+	{
+	.description = "l2_cntxt_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
+	.ident_bit_size = 10,
+	.ident_bit_pos = 42
+	},
 	/* class_tid: 2, wh_plus, table: l2_cntxt_tcam.0 */
 	{
 	.description = "l2_cntxt_id",
@@ -14050,7 +15513,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
 	.ident_bit_size = 8,
 	.ident_bit_pos = 28
 	},
-	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.0 */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.ing_0 */
 	{
 	.description = "l2_cntxt_id",
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14059,7 +15522,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
 	.ident_bit_size = 10,
 	.ident_bit_pos = 0
 	},
-	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam.0 */
+	/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.egr_0 */
 	{
 	.description = "l2_cntxt_id",
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14068,7 +15531,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
 	.ident_bit_size = 10,
 	.ident_bit_pos = 0
 	},
-	/* class_tid: 6, wh_plus, table: l2_cntxt_tcam.egr */
+	/* class_tid: 4, wh_plus, table: l2_cntxt_tcam.vf_egr */
 	{
 	.description = "l2_cntxt_id",
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
index 6e4d4d3ff3..b35846c7a9 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
@@ -28,6 +28,7 @@
 #define BNXT_ULP_PROTO_HDR_TCP_NUM	9
 #define BNXT_ULP_PROTO_HDR_VXLAN_NUM	4
 #define BNXT_ULP_PROTO_HDR_GRE_NUM	6
+#define BNXT_ULP_PROTO_HDR_ICMP_NUM	5
 #define BNXT_ULP_PROTO_HDR_MAX		128
 #define BNXT_ULP_PROTO_HDR_FIELD_SVIF_IDX	1
 
@@ -204,6 +205,16 @@ struct bnxt_ulp_device_params {
 	uint64_t			packet_count_mask;
 	uint32_t			byte_count_shift;
 	uint32_t			packet_count_shift;
+	uint32_t			dynamic_pad_en;
+	uint16_t			em_blk_size_bits;
+	uint16_t			em_blk_align_bits;
+	uint16_t			em_key_align_bytes;
+	uint16_t			em_result_size_bits;
+	uint16_t			wc_slice_width;
+	uint16_t			wc_max_slices;
+	uint32_t			wc_mode_list[4];
+	uint32_t			wc_mod_list_max_size;
+	uint32_t			wc_ctl_size_bits;
 	const struct bnxt_ulp_template_device_tbls *dev_tbls;
 };
 
@@ -226,6 +237,7 @@ struct bnxt_ulp_mapper_tbl_info {
 	uint8_t				direction;
 	enum bnxt_ulp_pri_opc		pri_opcode;
 	uint32_t			pri_operand;
+	enum bnxt_ulp_byte_order	byte_order;
 
 	/* conflict resoution opcode */
 	enum bnxt_ulp_accept_opc	accept_opcode;
diff --git a/drivers/net/bnxt/tf_ulp/ulp_tun.h b/drivers/net/bnxt/tf_ulp/ulp_tun.h
index 2516eaca2c..898071bfe7 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_tun.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_tun.h
@@ -16,10 +16,6 @@
 #include "ulp_template_db_enum.h"
 #include "ulp_template_struct.h"
 
-#if RTE_VERSION_NUM(17, 11, 10, 16) == RTE_VERSION
-#define	RTE_ETHER_ADDR_LEN	ETHER_ADDR_LEN
-#endif
-
 #define	BNXT_OUTER_TUN_FLOW(l3_tun, params)		\
 	((l3_tun) &&					\
 	 ULP_BITMAP_ISSET((params)->act_bitmap.bits,	\
diff --git a/drivers/net/bnxt/tf_ulp/ulp_utils.c b/drivers/net/bnxt/tf_ulp/ulp_utils.c
index 095a66a0c7..5dc710338a 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_utils.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_utils.c
@@ -3,6 +3,7 @@
  * All rights reserved.
  */
 
+#include <rte_common.h>
 #include "ulp_utils.h"
 #include "bnxt_tf_common.h"
 
@@ -232,6 +233,7 @@ ulp_bs_push_msb(uint8_t *bs, uint16_t pos, uint8_t len, uint8_t *val)
  * big endian.  All fields are packed with this order.
  *
  * returns 0 on error or 1 on success
+ * Notes - If bitlen is zero then set it to max.
  */
 uint32_t
 ulp_blob_init(struct ulp_blob *blob,
@@ -243,7 +245,10 @@ ulp_blob_init(struct ulp_blob *blob,
 		BNXT_TF_DBG(ERR, "invalid argument\n");
 		return 0; /* failure */
 	}
-	blob->bitlen = bitlen;
+	if (bitlen)
+		blob->bitlen = bitlen;
+	else
+		blob->bitlen = BNXT_ULP_FLMP_BLOB_SIZE_IN_BITS;
 	blob->byte_order = order;
 	blob->write_idx = 0;
 	memset(blob->data, 0, sizeof(blob->data));
@@ -505,6 +510,31 @@ ulp_blob_pad_push(struct ulp_blob *blob,
 	return datalen;
 }
 
+/*
+ * Adds pad to an initialized blob at the current offset based on
+ * the alignment.
+ *
+ * blob [in] The blob that needs to be aligned
+ *
+ * align [in] Alignment in bits.
+ *
+ * returns the number of pad bits added, -1 on failure
+ */
+int32_t
+ulp_blob_pad_align(struct ulp_blob *blob,
+		   uint32_t align)
+{
+	int32_t pad = 0;
+
+	pad = RTE_ALIGN(blob->write_idx, align) - blob->write_idx;
+	if (pad > (int32_t)(blob->bitlen - blob->write_idx)) {
+		BNXT_TF_DBG(ERR, "Pad too large for blob\n");
+		return -1;
+	}
+	blob->write_idx += pad;
+	return pad;
+}
+
 /* Get data from src and put into dst using little-endian format */
 static void
 ulp_bs_get_lsb(uint8_t *src, uint16_t bitpos, uint8_t bitlen, uint8_t *dst)
@@ -668,6 +698,24 @@ ulp_blob_data_get(struct ulp_blob *blob,
 	return blob->data;
 }
 
+/*
+ * Get the data length of the binary blob.
+ *
+ * blob [in] The blob's data len to be retrieved.
+ *
+ * returns length of the binary blob
+ */
+uint16_t
+ulp_blob_data_len_get(struct ulp_blob *blob)
+{
+	/* validate the arguments */
+	if (!blob) {
+		BNXT_TF_DBG(ERR, "invalid argument\n");
+		return 0; /* failure */
+	}
+	return blob->write_idx;
+}
+
 /*
  * Set the encap swap start index of the binary blob.
  *
@@ -731,14 +779,17 @@ ulp_blob_perform_encap_swap(struct ulp_blob *blob)
  * vice-versa.
  *
  * blob [in] The blob's data to be used for swap.
+ * chunk_size[in] the swap is done within the chunk in bytes
  *
  * returns void.
  */
 void
-ulp_blob_perform_byte_reverse(struct ulp_blob *blob)
+ulp_blob_perform_byte_reverse(struct ulp_blob *blob,
+			      uint32_t chunk_size)
 {
-	uint32_t idx = 0, num = 0;
+	uint32_t idx = 0, jdx = 0, num = 0;
 	uint8_t xchar;
+	uint8_t *buff;
 
 	/* validate the arguments */
 	if (!blob) {
@@ -746,11 +797,15 @@ ulp_blob_perform_byte_reverse(struct ulp_blob *blob)
 		return; /* failure */
 	}
 
-	num = ULP_BITS_2_BYTE_NR(blob->write_idx);
-	for (idx = 0; idx < (num / 2); idx++) {
-		xchar = blob->data[idx];
-		blob->data[idx] = blob->data[(num - 1) - idx];
-		blob->data[(num - 1) - idx] = xchar;
+	buff = blob->data;
+	num = ULP_BITS_2_BYTE(blob->write_idx) / chunk_size;
+	for (idx = 0; idx < num; idx++) {
+		for (jdx = 0; jdx < chunk_size / 2; jdx++) {
+			xchar = buff[jdx];
+			buff[jdx] = buff[(chunk_size - 1) - jdx];
+			buff[(chunk_size - 1) - jdx] = xchar;
+		}
+		buff += chunk_size;
 	}
 }
 
@@ -816,6 +871,122 @@ ulp_blob_perform_64B_byte_swap(struct ulp_blob *blob)
 	}
 }
 
+static int32_t
+ulp_blob_msb_block_merge(struct ulp_blob *dst, struct ulp_blob *src,
+			 uint32_t block_size, uint32_t pad)
+{
+	uint32_t i, k, write_bytes, remaining;
+	uint16_t num;
+	uint8_t *src_buf = ulp_blob_data_get(src, &num);
+	uint8_t bluff;
+
+	for (i = 0; i < num;) {
+		if (((dst->write_idx % block_size)  + (num - i)) > block_size)
+			write_bytes = block_size - dst->write_idx;
+		else
+			write_bytes = num - i;
+		for (k = 0; k < ULP_BITS_2_BYTE_NR(write_bytes); k++) {
+			ulp_bs_put_msb(dst->data, dst->write_idx, ULP_BLOB_BYTE,
+				       *src_buf);
+			dst->write_idx += ULP_BLOB_BYTE;
+			src_buf++;
+		}
+		remaining = write_bytes % ULP_BLOB_BYTE;
+		if (remaining) {
+			bluff = (*src_buf) & ((uint8_t)-1 <<
+					      (ULP_BLOB_BYTE - remaining));
+			ulp_bs_put_msb(dst->data, dst->write_idx,
+				       ULP_BLOB_BYTE, bluff);
+			dst->write_idx += remaining;
+		}
+		if (write_bytes != (num - i)) {
+			/* add the padding */
+			ulp_blob_pad_push(dst, pad);
+			if (remaining) {
+				ulp_bs_put_msb(dst->data, dst->write_idx,
+					       ULP_BLOB_BYTE - remaining,
+					       *src_buf);
+				dst->write_idx += ULP_BLOB_BYTE - remaining;
+				src_buf++;
+			}
+		}
+		i += write_bytes;
+	}
+	return 0;
+}
+
+/*
+ * Perform the blob buffer merge.
+ * This api makes the src blob merged to the dst blob.
+ * The block size and pad size help in padding the dst blob
+ *
+ * dst [in] The destination blob, the blob to be merged.
+ * src [in] The src blob.
+ * block_size [in] The size of the block after which padding gets applied.
+ * pad [in] The size of the pad to be applied.
+ *
+ * returns 0 on success.
+ */
+int32_t
+ulp_blob_block_merge(struct ulp_blob *dst, struct ulp_blob *src,
+		     uint32_t block_size, uint32_t pad)
+{
+	if (dst->byte_order == BNXT_ULP_BYTE_ORDER_BE &&
+	    src->byte_order == BNXT_ULP_BYTE_ORDER_BE)
+		return ulp_blob_msb_block_merge(dst, src, block_size, pad);
+
+	BNXT_TF_DBG(ERR, "block merge not implemented yet\n");
+	return -EINVAL;
+}
+
+int32_t
+ulp_blob_append(struct ulp_blob *dst, struct ulp_blob *src,
+		uint16_t src_offset, uint16_t src_len)
+{
+	uint32_t k, remaining;
+	uint16_t num;
+	uint8_t bluff;
+	uint8_t *src_buf = ulp_blob_data_get(src, &num);
+
+	if ((src_offset + src_len) > num)
+		return -EINVAL;
+
+	/* Only supporting BE for now */
+	if (src->byte_order != BNXT_ULP_BYTE_ORDER_BE ||
+	    dst->byte_order != BNXT_ULP_BYTE_ORDER_BE)
+		return -EINVAL;
+
+	/* Handle if the source offset is not on a byte boundary */
+	remaining = src_offset % ULP_BLOB_BYTE;
+	if (remaining) {
+		bluff = src_buf[src_offset / ULP_BLOB_BYTE] & ((uint8_t)-1 >>
+				      (ULP_BLOB_BYTE - remaining));
+		ulp_bs_put_msb(dst->data, dst->write_idx,
+			       ULP_BLOB_BYTE, bluff);
+		dst->write_idx += remaining;
+	}
+
+	/* Push the byte aligned pieces */
+	for (k = 0; k < ULP_BITS_2_BYTE_NR(src_len); k++) {
+		ulp_bs_put_msb(dst->data, dst->write_idx, ULP_BLOB_BYTE,
+			       *src_buf);
+		dst->write_idx += ULP_BLOB_BYTE;
+		src_buf++;
+	}
+
+	/* Handle the remaining if length is not a byte boundary */
+	remaining = src_len % ULP_BLOB_BYTE;
+	if (remaining) {
+		bluff = (*src_buf) & ((uint8_t)-1 <<
+				      (ULP_BLOB_BYTE - remaining));
+		ulp_bs_put_msb(dst->data, dst->write_idx,
+			       ULP_BLOB_BYTE, bluff);
+		dst->write_idx += remaining;
+	}
+
+	return 0;
+}
+
 /*
  * Read data from the operand
  *
diff --git a/drivers/net/bnxt/tf_ulp/ulp_utils.h b/drivers/net/bnxt/tf_ulp/ulp_utils.h
index 2d62b25060..a30361b8ae 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_utils.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_utils.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2019 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -9,10 +9,12 @@
 #include "bnxt.h"
 #include "ulp_template_db_enum.h"
 
+#define ULP_BUFFER_ALIGN_8_BITS		8
 #define ULP_BUFFER_ALIGN_8_BYTE		8
 #define ULP_BUFFER_ALIGN_16_BYTE	16
 #define ULP_BUFFER_ALIGN_64_BYTE	64
 #define ULP_64B_IN_BYTES		8
+
 /*
  * Macros for bitmap sets and gets
  * These macros can be used if the val are power of 2.
@@ -289,6 +291,16 @@ uint8_t *
 ulp_blob_data_get(struct ulp_blob *blob,
 		  uint16_t *datalen);
 
+/*
+ * Get the data length of the binary blob.
+ *
+ * blob [in] The blob's data len to be retrieved.
+ *
+ * returns length of the binary blob
+ */
+uint16_t
+ulp_blob_data_len_get(struct ulp_blob *blob);
+
 /*
  * Get data from the byte array in Little endian format.
  *
@@ -356,6 +368,20 @@ int32_t
 ulp_blob_pad_push(struct ulp_blob *blob,
 		  uint32_t datalen);
 
+/*
+ * Adds pad to an initialized blob at the current offset based on
+ * the alignment.
+ *
+ * blob [in] The blob that needs to be aligned
+ *
+ * align [in] Alignment in bits.
+ *
+ * returns the number of pad bits added, -1 on failure
+ */
+int32_t
+ulp_blob_pad_align(struct ulp_blob *blob,
+		   uint32_t align);
+
 /*
  * Set the 64 bit swap start index of the binary blob.
  *
@@ -383,11 +409,13 @@ ulp_blob_perform_encap_swap(struct ulp_blob *blob);
  * vice-versa.
  *
  * blob [in] The blob's data to be used for swap.
+ * chunk_size[in] the swap is done within the chunk in bytes
  *
  * returns void.
  */
 void
-ulp_blob_perform_byte_reverse(struct ulp_blob *blob);
+ulp_blob_perform_byte_reverse(struct ulp_blob *blob,
+			      uint32_t chunk_size);
 
 /*
  * Perform the blob buffer 64 bit word swap.
@@ -413,6 +441,40 @@ ulp_blob_perform_64B_word_swap(struct ulp_blob *blob);
 void
 ulp_blob_perform_64B_byte_swap(struct ulp_blob *blob);
 
+/*
+ * Perform the blob buffer merge.
+ * This api makes the src blob merged to the dst blob.
+ * The block size and pad size help in padding the dst blob
+ *
+ * dst [in] The destination blob, the blob to be merged.
+ * src [in] The src blob.
+ * block_size [in] The size of the block after which padding gets applied.
+ * pad [in] The size of the pad to be applied.
+ *
+ * returns 0 on success.
+ */
+int32_t
+ulp_blob_block_merge(struct ulp_blob *dst, struct ulp_blob *src,
+		     uint32_t block_size, uint32_t pad);
+
+/*
+ * Append bits from src blob to dst blob.
+ * Only works on BE blobs
+ *
+ * dst [in/out] The destination blob to append to
+ *
+ * src [in] The src blob to append from
+ *
+ * src_offset [in] The bit offset from src to start at
+ *
+ * src_len [in] The number of bits to append to dst
+ *
+ * returns 0 on success, non-zero on error
+ */
+int32_t
+ulp_blob_append(struct ulp_blob *dst, struct ulp_blob *src,
+		uint16_t src_offset, uint16_t src_len);
+
 /*
  * Read data from the operand
  *
