octeontx2-af: Update the default KPU profile and fixes

Add support for parsing following
 1. NGIO
 2. PPPOE
 3. 24 byte custom L2 header
 4. CPT Header
 5. Fragmented CPT packets
 6. VLAN EXDSA

Fix for
 1. EDSA VLAN parsing
 2. Enhance FDSA
 3. CPT Header parsing

Remove ITAG support

Signed-off-by: Sunil Kovvuri Goutham <Sunil.Goutham@marvell.com>
Signed-off-by: Harman Kalra <hkalra@marvell.com>
Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Signed-off-by: George Cherian <george.cherian@marvell.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/npc.h b/drivers/net/ethernet/marvell/octeontx2/af/npc.h
index 8afa1c6..fe19704 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/npc.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/npc.h
@@ -33,6 +33,10 @@ enum npc_kpu_la_ltype {
        NPC_LT_LA_IH_2_ETHER,
        NPC_LT_LA_HIGIG2_ETHER,
        NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+       NPC_LT_LA_CUSTOM_L2_90B_ETHER,
+       NPC_LT_LA_CH_LEN_90B_ETHER,
+       NPC_LT_LA_CPT_HDR,
+       NPC_LT_LA_CUSTOM_L2_24B_ETHER,
        NPC_LT_LA_CUSTOM0 = 0xE,
        NPC_LT_LA_CUSTOM1 = 0xF,
 };
@@ -42,7 +46,7 @@ enum npc_kpu_lb_ltype {
        NPC_LT_LB_CTAG,
        NPC_LT_LB_STAG_QINQ,
        NPC_LT_LB_BTAG,
-       NPC_LT_LB_ITAG,
+       NPC_LT_LB_PPPOE,
        NPC_LT_LB_DSA,
        NPC_LT_LB_DSA_VLAN,
        NPC_LT_LB_EDSA,
@@ -50,6 +54,7 @@ enum npc_kpu_lb_ltype {
        NPC_LT_LB_EXDSA,
        NPC_LT_LB_EXDSA_VLAN,
        NPC_LT_LB_FDSA,
+       NPC_LT_LB_VLAN_EXDSA,
        NPC_LT_LB_CUSTOM0 = 0xE,
        NPC_LT_LB_CUSTOM1 = 0xF,
 };
@@ -65,6 +70,7 @@ enum npc_kpu_lc_ltype {
        NPC_LT_LC_NSH,
        NPC_LT_LC_PTP,
        NPC_LT_LC_FCOE,
+       NPC_LT_LC_NGIO,
        NPC_LT_LC_CUSTOM0 = 0xE,
        NPC_LT_LC_CUSTOM1 = 0xF,
 };
@@ -146,7 +152,14 @@ enum npc_kpu_lh_ltype {
  * Ethernet interfaces, LBK interfaces, etc.
  */
 enum npc_pkind_type {
-       NPC_TX_DEF_PKIND = 63ULL,       /* NIX-TX PKIND */
+       NPC_RX_VLAN_EXDSA_PKIND = 56ULL,
+       NPC_RX_CHLEN24B_PKIND = 57ULL,
+       NPC_RX_CPT_HDR_PKIND,
+       NPC_RX_CHLEN90B_PKIND,
+       NPC_TX_HIGIG_PKIND,
+       NPC_RX_HIGIG_PKIND,
+       NPC_RX_EDSA_PKIND,
+       NPC_TX_DEF_PKIND,       /* NIX-TX PKIND */
 };
 
 /* list of known and supported fields in packet header and
@@ -521,8 +534,8 @@ struct npc_lt_def_cfg {
        struct npc_lt_def       pck_iip4;
        struct npc_lt_def_apad  rx_apad0;
        struct npc_lt_def_apad  rx_apad1;
-       struct npc_lt_def_color rx_ovlan;
-       struct npc_lt_def_color rx_ivlan;
+       struct npc_lt_def_color ovlan;
+       struct npc_lt_def_color ivlan;
        struct npc_lt_def_color rx_gen0_color;
        struct npc_lt_def_color rx_gen1_color;
        struct npc_lt_def_et    rx_et[2];

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h b/drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h
index 980435e..fee655c 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h
@@ -23,6 +23,7 @@
 #define NPC_ETYPE_IP6          0x86dd
 #define NPC_ETYPE_ARP          0x0806
 #define NPC_ETYPE_RARP         0x8035
+#define NPC_ETYPE_NGIO         0x8842
 #define NPC_ETYPE_MPLSU                0x8847
 #define NPC_ETYPE_MPLSM                0x8848
 #define NPC_ETYPE_ETAG         0x893f
@@ -36,6 +37,10 @@
 #define NPC_ETYPE_PPP          0x880b
 #define NPC_ETYPE_NSH          0x894f
 #define NPC_ETYPE_DSA          0xdada
+#define NPC_ETYPE_PPPOE                0x8864
+
+#define NPC_PPP_IP             0x0021
+#define NPC_PPP_IP6            0x0057
 
 #define NPC_IPNH_HOP           0
 #define NPC_IPNH_ICMP          1
@@ -145,14 +150,15 @@
 #define NPC_DSA_EDSA           0x8000
 #define NPC_DSA_FDSA           0xc000
 
-#define NPC_KEXOF_DMAC 8
-#define MKEX_SIGN      0x19bbfdbd15f /* strtoull of "mkexprof" with base:36 */
+#define NPC_KEXOF_DMAC 9
+#define MKEX_SIGN      0x19bbfdbd15f
 #define KEX_LD_CFG(bytesm1, hdr_ofs, ena, flags_ena, key_ofs)          \
                        (((bytesm1) << 16) | ((hdr_ofs) << 8) | ((ena) << 7) | \
                         ((flags_ena) << 6) | ((key_ofs) & 0x3F))
 
 /* Rx parse key extract nibble enable */
 #define NPC_PARSE_NIBBLE_INTF_RX       (NPC_PARSE_NIBBLE_CHAN | \
+                                        NPC_PARSE_NIBBLE_ERRCODE | \
                                         NPC_PARSE_NIBBLE_LA_LTYPE | \
                                         NPC_PARSE_NIBBLE_LB_LTYPE | \
                                         NPC_PARSE_NIBBLE_LC_LTYPE | \
@@ -173,25 +179,31 @@ enum npc_kpu_parser_state {
        NPC_S_KPU1_EXDSA,
        NPC_S_KPU1_HIGIG2,
        NPC_S_KPU1_IH_NIX_HIGIG2,
+       NPC_S_KPU1_CUSTOM_L2_90B,
+       NPC_S_KPU1_CPT_HDR,
+       NPC_S_KPU1_CUSTOM_L2_24B,
+       NPC_S_KPU1_VLAN_EXDSA,
        NPC_S_KPU2_CTAG,
        NPC_S_KPU2_CTAG2,
        NPC_S_KPU2_SBTAG,
        NPC_S_KPU2_QINQ,
        NPC_S_KPU2_ETAG,
-       NPC_S_KPU2_ITAG,
        NPC_S_KPU2_PREHEADER,
        NPC_S_KPU2_EXDSA,
+       NPC_S_KPU2_NGIO,
        NPC_S_KPU3_CTAG,
        NPC_S_KPU3_STAG,
        NPC_S_KPU3_QINQ,
-       NPC_S_KPU3_ITAG,
        NPC_S_KPU3_CTAG_C,
        NPC_S_KPU3_STAG_C,
        NPC_S_KPU3_QINQ_C,
        NPC_S_KPU3_DSA,
+       NPC_S_KPU3_VLAN_EXDSA,
        NPC_S_KPU4_MPLS,
        NPC_S_KPU4_NSH,
        NPC_S_KPU4_FDSA,
+       NPC_S_KPU4_VLAN_EXDSA,
+       NPC_S_KPU4_PPPOE,
        NPC_S_KPU5_IP,
        NPC_S_KPU5_IP6,
        NPC_S_KPU5_ARP,
@@ -201,13 +213,19 @@ enum npc_kpu_parser_state {
        NPC_S_KPU5_MPLS,
        NPC_S_KPU5_MPLS_PL,
        NPC_S_KPU5_NSH,
+       NPC_S_KPU5_CPT_IP,
+       NPC_S_KPU5_CPT_IP6,
        NPC_S_KPU6_IP6_EXT,
        NPC_S_KPU6_IP6_HOP_DEST,
        NPC_S_KPU6_IP6_ROUT,
        NPC_S_KPU6_IP6_FRAG,
+       NPC_S_KPU6_IP6_CPT_FRAG,
+       NPC_S_KPU6_IP6_CPT_HOP_DEST,
+       NPC_S_KPU6_IP6_CPT_ROUT,
        NPC_S_KPU7_IP6_EXT,
        NPC_S_KPU7_IP6_ROUT,
        NPC_S_KPU7_IP6_FRAG,
+       NPC_S_KPU7_CPT_IP6_FRAG,
        NPC_S_KPU8_TCP,
        NPC_S_KPU8_UDP,
        NPC_S_KPU8_SCTP,
@@ -268,7 +286,6 @@ enum npc_kpu_la_lflag {
        NPC_F_LA_L_UNK_ETYPE = 1,
        NPC_F_LA_L_WITH_VLAN,
        NPC_F_LA_L_WITH_ETAG,
-       NPC_F_LA_L_WITH_ITAG,
        NPC_F_LA_L_WITH_MPLS,
        NPC_F_LA_L_WITH_NSH,
 };
@@ -974,7 +991,7 @@ static struct npc_kpu_profile_action ikpu_action_entries[] = {
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                12, 16, 20, 0, 0,
-               NPC_S_KPU1_ETHER, 0, 0,
+               NPC_S_KPU1_VLAN_EXDSA, 0, 0,
                NPC_LID_LA, NPC_LT_NA,
                0,
                0, 0, 0, 0,
@@ -982,8 +999,8 @@ static struct npc_kpu_profile_action ikpu_action_entries[] = {
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 16, 20, 0, 0,
-               NPC_S_KPU1_ETHER, 0, 0,
+               36, 40, 44, 0, 0,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0, 0,
                NPC_LID_LA, NPC_LT_NA,
                0,
                0, 0, 0, 0,
@@ -991,8 +1008,8 @@ static struct npc_kpu_profile_action ikpu_action_entries[] = {
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 16, 20, 0, 0,
-               NPC_S_KPU1_ETHER, 0, 0,
+               40, 54, 58, 0, 0,
+               NPC_S_KPU1_CPT_HDR, 0, 0,
                NPC_LID_LA, NPC_LT_NA,
                0,
                0, 0, 0, 0,
@@ -1000,8 +1017,8 @@ static struct npc_kpu_profile_action ikpu_action_entries[] = {
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 16, 20, 0, 0,
-               NPC_S_KPU1_ETHER, 0, 0,
+               102, 106, 110, 0, 0,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0, 0,
                NPC_LID_LA, NPC_LT_NA,
                0,
                0, 0, 0, 0,
@@ -1106,6 +1123,15 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
                NPC_S_KPU1_ETHER, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
+               NPC_ETYPE_NGIO,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU1_ETHER, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_CTAG,
                0xffff,
                0x0000,
@@ -1149,7 +1175,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_ETHER, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
                0x0000,
@@ -1158,7 +1184,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_ETHER, 0xff,
-               NPC_ETYPE_MPLSU,
+               NPC_ETYPE_MPLSM,
                0xffff,
                0x0000,
                0x0000,
@@ -1167,7 +1193,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_ETHER, 0xff,
-               NPC_ETYPE_MPLSM,
+               NPC_ETYPE_NSH,
                0xffff,
                0x0000,
                0x0000,
@@ -1176,7 +1202,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_ETHER, 0xff,
-               NPC_ETYPE_NSH,
+               NPC_ETYPE_DSA,
                0xffff,
                0x0000,
                0x0000,
@@ -1185,7 +1211,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_ETHER, 0xff,
-               NPC_ETYPE_DSA,
+               NPC_ETYPE_PPPOE,
                0xffff,
                0x0000,
                0x0000,
@@ -1320,15 +1346,6 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_IH_NIX, 0xff,
-               NPC_ETYPE_ITAG,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU1_IH_NIX, 0xff,
                NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
@@ -1365,8 +1382,8 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_IH, 0xff,
-               NPC_IH_W|NPC_IH_UTAG,
-               NPC_IH_W|NPC_IH_UTAG,
+               NPC_IH_W | NPC_IH_UTAG,
+               NPC_IH_W | NPC_IH_UTAG,
                0x0000,
                0x0000,
                0x0000,
@@ -1375,7 +1392,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        {
                NPC_S_KPU1_IH, 0xff,
                NPC_IH_W,
-               NPC_IH_W|NPC_IH_UTAG,
+               NPC_IH_W | NPC_IH_UTAG,
                0x0000,
                0x0000,
                0x0000,
@@ -1384,7 +1401,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        {
                NPC_S_KPU1_IH, 0xff,
                0x0000,
-               NPC_IH_W|NPC_IH_UTAG,
+               NPC_IH_W | NPC_IH_UTAG,
                0x0000,
                0x0000,
                0x0000,
@@ -1527,15 +1544,6 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_HIGIG2, 0xff,
-               NPC_ETYPE_ITAG,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU1_HIGIG2, 0xff,
                NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
@@ -1671,7 +1679,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_IH_NIX_HIGIG2, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
                0x0000,
@@ -1680,7 +1688,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_IH_NIX_HIGIG2, 0xff,
-               NPC_ETYPE_MPLSU,
+               NPC_ETYPE_MPLSM,
                0xffff,
                0x0000,
                0x0000,
@@ -1689,7 +1697,7 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_IH_NIX_HIGIG2, 0xff,
-               NPC_ETYPE_MPLSM,
+               NPC_ETYPE_NSH,
                0xffff,
                0x0000,
                0x0000,
@@ -1698,39 +1706,52 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_IH_NIX_HIGIG2, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU1_IH_NIX_HIGIG2, 0xff,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_IP,
+               0xffff,
+               0x0000,
                0x0000,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_NA, 0X00,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_ARP,
+               0xffff,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_RARP,
+               0xffff,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
-};
-
-static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU2_CTAG, 0xff,
-               NPC_ETYPE_IP,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_PTP,
                0xffff,
                0x0000,
                0x0000,
@@ -1738,8 +1759,8 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_CTAG, 0xff,
-               NPC_ETYPE_IP6,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_FCOE,
                0xffff,
                0x0000,
                0x0000,
@@ -1747,8 +1768,17 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_CTAG, 0xff,
-               NPC_ETYPE_ARP,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_CTAG,
                0xffff,
                0x0000,
                0x0000,
@@ -1756,8 +1786,8 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_CTAG, 0xff,
-               NPC_ETYPE_RARP,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_SBTAG,
                0xffff,
                0x0000,
                0x0000,
@@ -1765,8 +1795,8 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_CTAG, 0xff,
-               NPC_ETYPE_PTP,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_QINQ,
                0xffff,
                0x0000,
                0x0000,
@@ -1774,8 +1804,8 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_CTAG, 0xff,
-               NPC_ETYPE_FCOE,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
+               NPC_ETYPE_ETAG,
                0xffff,
                0x0000,
                0x0000,
@@ -1783,7 +1813,7 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_CTAG, 0xff,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
                NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
@@ -1792,7 +1822,7 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_CTAG, 0xff,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
                NPC_ETYPE_MPLSM,
                0xffff,
                0x0000,
@@ -1801,7 +1831,7 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_CTAG, 0xff,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
                NPC_ETYPE_NSH,
                0xffff,
                0x0000,
@@ -1810,7 +1840,7 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_CTAG, 0xff,
+               NPC_S_KPU1_CUSTOM_L2_90B, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -1819,8 +1849,8 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU1_CPT_HDR, 0xff,
+               0x0000,
                0xffff,
                NPC_ETYPE_IP,
                0xffff,
@@ -1828,8 +1858,8 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU1_CPT_HDR, 0xff,
+               0x0000,
                0xffff,
                NPC_ETYPE_IP6,
                0xffff,
@@ -1837,197 +1867,188 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU1_CPT_HDR, 0xff,
+               0x0000,
                0xffff,
-               NPC_ETYPE_ARP,
+               NPC_ETYPE_CTAG,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU1_CPT_HDR, 0xff,
+               0x0000,
                0xffff,
-               NPC_ETYPE_RARP,
+               NPC_ETYPE_QINQ,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_PTP,
+               NPC_S_KPU1_CPT_HDR, 0xff,
+               0x0000,
                0xffff,
                0x0000,
                0x0000,
+               NPC_ETYPE_IP,
+               0xffff,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_FCOE,
+               NPC_S_KPU1_CPT_HDR, 0xff,
+               0x0000,
                0xffff,
                0x0000,
                0x0000,
+               NPC_ETYPE_IP6,
+               0xffff,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_MPLSU,
+               NPC_S_KPU1_CPT_HDR, 0xff,
+               0x0000,
                0xffff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_NSH,
+               NPC_S_KPU1_CPT_HDR, 0xff,
+               0x0000,
                0xffff,
                0x0000,
                0x0000,
+               NPC_ETYPE_QINQ,
+               0xffff,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               NPC_S_KPU1_CPT_HDR, 0xff,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_IP,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_SBTAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_IP6,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_ARP,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_IP,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_RARP,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_IP6,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_PTP,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_ARP,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_FCOE,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_RARP,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_CTAG,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_PTP,
-               0xffff,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_CTAG,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_FCOE,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_SBTAG,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_MPLSU,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_QINQ,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_MPLSM,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_ETAG,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_NSH,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_SBTAG,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_MPLSM,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
-               NPC_ETYPE_ITAG,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
                0x0000,
                0x0000,
@@ -2035,7 +2056,7 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_S_KPU1_CUSTOM_L2_24B, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -2044,89 +2065,103 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
+               NPC_S_KPU1_VLAN_EXDSA, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_NA, 0X00,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+};
+
+static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       {
+               NPC_S_KPU2_CTAG, 0xff,
                NPC_ETYPE_IP,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               NPC_S_KPU2_CTAG, 0xff,
                NPC_ETYPE_IP6,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               NPC_S_KPU2_CTAG, 0xff,
                NPC_ETYPE_ARP,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               NPC_S_KPU2_CTAG, 0xff,
                NPC_ETYPE_RARP,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               NPC_S_KPU2_CTAG, 0xff,
                NPC_ETYPE_PTP,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               NPC_S_KPU2_CTAG, 0xff,
                NPC_ETYPE_FCOE,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               NPC_S_KPU2_CTAG, 0xff,
                NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               NPC_S_KPU2_CTAG, 0xff,
                NPC_ETYPE_MPLSM,
                0xffff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_NSH,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU2_CTAG, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
                0x0000,
                0x0000,
@@ -2134,25 +2169,25 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_QINQ,
-               0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU2_CTAG, 0xff,
+               NPC_ETYPE_PPPOE,
                0xffff,
                0x0000,
                0x0000,
+               NPC_PPP_IP,
+               0xffff,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
-               NPC_ETYPE_QINQ,
-               0xffff,
-               NPC_ETYPE_QINQ,
+               NPC_S_KPU2_CTAG, 0xff,
+               NPC_ETYPE_PPPOE,
                0xffff,
                0x0000,
                0x0000,
+               NPC_PPP_IP6,
+               0xffff,
        },
        {
-               NPC_S_KPU2_QINQ, 0xff,
+               NPC_S_KPU2_CTAG, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -2161,88 +2196,88 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_IP,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_IP6,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_ARP,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_RARP,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_PTP,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_FCOE,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_MPLSM,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                NPC_ETYPE_NSH,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
                0x0000,
@@ -2251,34 +2286,25 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_SBTAG,
                0xffff,
-               NPC_ETYPE_ITAG,
+               NPC_ETYPE_CTAG,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_SBTAG,
                0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_ETAG, 0xff,
-               NPC_ETYPE_QINQ,
+               NPC_ETYPE_SBTAG,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_ITAG,
                0xffff,
                0x0000,
@@ -2287,7 +2313,7 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0xffff,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_ITAG,
                0xffff,
                0x0000,
@@ -2296,7 +2322,7 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0xffff,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_ITAG,
                0xffff,
                0x0000,
@@ -2305,62 +2331,80 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0xffff,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_ITAG,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_SBTAG,
+               NPC_ETYPE_RARP,
                0xffff,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_ITAG,
                0xffff,
                0x0000,
                0x0000,
-               NPC_ETYPE_CTAG,
+               NPC_ETYPE_PTP,
                0xffff,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
+               NPC_S_KPU2_SBTAG, 0xff,
                NPC_ETYPE_ITAG,
                0xffff,
                0x0000,
                0x0000,
-               0x0000,
-               0x0000,
+               NPC_ETYPE_FCOE,
+               0xffff,
        },
        {
-               NPC_S_KPU2_ETAG, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_ITAG,
+               0xffff,
                0x0000,
                0x0000,
+               NPC_ETYPE_MPLSU,
+               0xffff,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_IP,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_ITAG,
                0xffff,
                0x0000,
                0x0000,
+               NPC_ETYPE_MPLSM,
+               0xffff,
+       },
+       {
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_ITAG,
+               0xffff,
                0x0000,
                0x0000,
+               NPC_ETYPE_NSH,
+               0xffff,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_IP6,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_ITAG,
                0xffff,
                0x0000,
                0x0000,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+       },
+       {
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_ITAG,
+               0xffff,
                0x0000,
                0x0000,
+               NPC_ETYPE_CTAG,
+               0xffff,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_ARP,
+               NPC_S_KPU2_SBTAG, 0xff,
+               NPC_ETYPE_ITAG,
                0xffff,
                0x0000,
                0x0000,
@@ -2368,124 +2412,295 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_RARP,
-               0xffff,
+               NPC_S_KPU2_SBTAG, 0xff,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
+               NPC_S_KPU2_QINQ, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
                NPC_ETYPE_IP,
                0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
+               NPC_S_KPU2_QINQ, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
                NPC_ETYPE_IP6,
                0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
+               NPC_S_KPU2_QINQ, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
                NPC_ETYPE_ARP,
                0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
+               NPC_S_KPU2_QINQ, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
+               NPC_ETYPE_RARP,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
+               NPC_S_KPU2_QINQ, 0xff,
+               NPC_ETYPE_CTAG,
                0xffff,
-               NPC_ETYPE_IP,
+               NPC_ETYPE_PTP,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
+               NPC_S_KPU2_QINQ, 0xff,
+               NPC_ETYPE_CTAG,
                0xffff,
-               NPC_ETYPE_IP6,
+               NPC_ETYPE_FCOE,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_ARP,
+               NPC_S_KPU2_QINQ, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
+               NPC_S_KPU2_QINQ, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_MPLSM,
                0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU2_QINQ, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_NSH,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
+               NPC_S_KPU2_QINQ, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
-               NPC_ETYPE_IP,
-               0xffff,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
+               NPC_S_KPU2_QINQ, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
                NPC_ETYPE_CTAG,
                0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_QINQ, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_QINQ, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_IP,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
                NPC_ETYPE_IP6,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_ARP,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_RARP,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_PTP,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_FCOE,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_MPLSU,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_MPLSM,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_NSH,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
+               NPC_S_KPU2_ETAG, 0xff,
                NPC_ETYPE_CTAG,
                0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_ITAG,
+               0xffff,
+               0x0000,
+               0x0000,
+               NPC_ETYPE_IP,
+               0xffff,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_ITAG,
+               0xffff,
+               0x0000,
+               0x0000,
+               NPC_ETYPE_IP6,
+               0xffff,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_ITAG,
+               0xffff,
+               0x0000,
+               0x0000,
                NPC_ETYPE_ARP,
                0xffff,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_ITAG,
+               0xffff,
                0x0000,
                0x0000,
+               NPC_ETYPE_SBTAG,
+               0xffff,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_ITAG,
+               0xffff,
+               0x0000,
+               0x0000,
                NPC_ETYPE_CTAG,
                0xffff,
+       },
+       {
+               NPC_S_KPU2_ETAG, 0xff,
+               NPC_ETYPE_ITAG,
+               0xffff,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU2_ITAG, 0xff,
+               NPC_S_KPU2_ETAG, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -2845,6 +3060,15 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
+               NPC_S_KPU2_NGIO, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
                NPC_S_NA, 0X00,
                0x0000,
                0x0000,
@@ -3273,7 +3497,7 @@ static struct npc_kpu_profile_cam kpu3_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU3_ITAG, 0xff,
+               NPC_S_KPU3_CTAG_C, 0xff,
                NPC_ETYPE_IP,
                0xffff,
                0x0000,
@@ -3282,7 +3506,7 @@ static struct npc_kpu_profile_cam kpu3_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU3_ITAG, 0xff,
+               NPC_S_KPU3_CTAG_C, 0xff,
                NPC_ETYPE_IP6,
                0xffff,
                0x0000,
@@ -3291,7 +3515,7 @@ static struct npc_kpu_profile_cam kpu3_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU3_ITAG, 0xff,
+               NPC_S_KPU3_CTAG_C, 0xff,
                NPC_ETYPE_ARP,
                0xffff,
                0x0000,
@@ -3300,7 +3524,7 @@ static struct npc_kpu_profile_cam kpu3_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU3_ITAG, 0xff,
+               NPC_S_KPU3_CTAG_C, 0xff,
                NPC_ETYPE_RARP,
                0xffff,
                0x0000,
@@ -3309,197 +3533,44 @@ static struct npc_kpu_profile_cam kpu3_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_IP,
-               0xffff,
-       },
-       {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_IP6,
-               0xffff,
-       },
-       {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_ARP,
-               0xffff,
-       },
-       {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_IP,
+               NPC_S_KPU3_CTAG_C, 0xff,
+               NPC_ETYPE_PTP,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_IP6,
+               NPC_S_KPU3_CTAG_C, 0xff,
+               NPC_ETYPE_FCOE,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_ARP,
+               NPC_S_KPU3_CTAG_C, 0xff,
+               NPC_ETYPE_MPLSU,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU3_CTAG_C, 0xff,
+               NPC_ETYPE_MPLSM,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_IP,
-               0xffff,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               NPC_ETYPE_ARP,
-               0xffff,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_ITAG, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_ITAG, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_CTAG_C, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_CTAG_C, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_CTAG_C, 0xff,
-               NPC_ETYPE_ARP,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_CTAG_C, 0xff,
-               NPC_ETYPE_RARP,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_CTAG_C, 0xff,
-               NPC_ETYPE_PTP,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_CTAG_C, 0xff,
-               NPC_ETYPE_FCOE,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_CTAG_C, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_CTAG_C, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU3_CTAG_C, 0xff,
-               NPC_ETYPE_NSH,
+               NPC_S_KPU3_CTAG_C, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
                0x0000,
                0x0000,
@@ -3966,6 +4037,15 @@ static struct npc_kpu_profile_cam kpu3_cam_entries[] = {
                0x0000,
        },
        {
+               NPC_S_KPU3_VLAN_EXDSA, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
                NPC_S_NA, 0X00,
                0x0000,
                0x0000,
@@ -4116,170 +4196,323 @@ static struct npc_kpu_profile_cam kpu4_cam_entries[] = {
        },
        {
                NPC_S_KPU4_FDSA, 0xff,
-               0x0000,
-               NPC_DSA_FDSA,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_IP,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU4_FDSA, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_IP6,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_NA, 0X00,
+               NPC_S_KPU4_FDSA, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_ARP,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU4_FDSA, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_RARP,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU4_FDSA, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_PTP,
+               0xffff,
                0x0000,
                0x0000,
        },
-};
-
-static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU5_IP, 0xff,
+               NPC_S_KPU4_FDSA, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_FCOE,
+               0xffff,
                0x0000,
-               NPC_IP_TTL_MASK,
+               0x0000,
+       },
+       {
+               NPC_S_KPU4_FDSA, 0xff,
+               NPC_ETYPE_PPPOE,
+               0xffff,
                0x0000,
                0x0000,
+               NPC_PPP_IP,
+               0xffff,
+       },
+       {
+               NPC_S_KPU4_FDSA, 0xff,
+               NPC_ETYPE_PPPOE,
+               0xffff,
                0x0000,
                0x0000,
+               NPC_PPP_IP6,
+               0xffff,
        },
        {
-               NPC_S_KPU5_IP, 0xff,
+               NPC_S_KPU4_FDSA, 0xff,
                0x0000,
+               NPC_DSA_FDSA,
                0x0000,
                0x0000,
                0x0000,
-               0x0001,
-               NPC_IP_HDR_FRAGOFF,
-       },
-       {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_TCP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
        },
        {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_UDP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
+               NPC_S_KPU4_VLAN_EXDSA, 0xff,
+               NPC_ETYPE_IP,
+               0xffff,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
-       },
-       {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_SCTP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
-       },
-       {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_ICMP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
-       },
-       {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_IGMP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
        },
        {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_ESP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
+               NPC_S_KPU4_VLAN_EXDSA, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
-       },
-       {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_AH,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
-       },
-       {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_GRE,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
-       },
-       {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_IP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
        },
        {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_IP6,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
+               NPC_S_KPU4_VLAN_EXDSA, 0xff,
+               NPC_ETYPE_ARP,
+               0xffff,
+               0x0000,
+               0x0000,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
-       },
-       {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_MPLS,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
        },
        {
-               NPC_S_KPU5_IP, 0xff,
+               NPC_S_KPU4_VLAN_EXDSA, 0xff,
+               NPC_ETYPE_RARP,
+               0xffff,
+               0x0000,
                0x0000,
                0x0000,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
        },
        {
-               NPC_S_KPU5_IP, 0xff,
+               NPC_S_KPU4_VLAN_EXDSA, 0xff,
+               NPC_ETYPE_PTP,
+               0xffff,
                0x0000,
                0x0000,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU5_IP, 0xff,
-               NPC_IPNH_TCP,
-               0x00ff,
+               NPC_S_KPU4_VLAN_EXDSA, 0xff,
+               NPC_ETYPE_FCOE,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU4_VLAN_EXDSA, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU4_PPPOE, 0xff,
+               NPC_PPP_IP,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU4_PPPOE, 0xff,
+               NPC_PPP_IP6,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_NA, 0X00,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+};
+
+static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       {
+               NPC_S_KPU5_IP, 0xff,
+               0x0000,
+               NPC_IP_TTL_MASK,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0001,
+               NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_TCP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_UDP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_SCTP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_ICMP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_IGMP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_ESP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_AH,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_GRE,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_IP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_IP6,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_MPLS,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU5_IP, 0xff,
+               NPC_IPNH_TCP,
+               0x00ff,
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4288,7 +4521,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4297,7 +4530,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4306,7 +4539,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4315,7 +4548,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4324,7 +4557,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4333,7 +4566,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4342,7 +4575,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4351,7 +4584,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4360,7 +4593,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4369,7 +4602,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4378,7 +4611,7 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                NPC_IP_VER_4,
                NPC_IP_VER_MASK,
                0x0000,
-               NPC_IP_HDR_MF|NPC_IP_HDR_FRAGOFF,
+               NPC_IP_HDR_MF | NPC_IP_HDR_FRAGOFF,
        },
        {
                NPC_S_KPU5_IP, 0xff,
@@ -4696,345 +4929,421 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_NA, 0X00,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
                0x0000,
+               NPC_IP_TTL_MASK,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
-};
-
-static struct npc_kpu_profile_cam kpu6_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU6_IP6_EXT, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
+               0x0001,
+               NPC_IP_HDR_FRAGOFF,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_TCP << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_TCP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_UDP << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_UDP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_SCTP << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_SCTP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_ICMP << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_ICMP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_ICMP6 << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_IGMP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_ESP << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_ESP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_AH << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_AH,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_GRE << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_GRE,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_IP6 << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_IP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               NPC_IPNH_MPLS << 8,
-               0xff00,
-               0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_IP6,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_FRAG, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_MPLS,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_TCP << 8,
-               0xff00,
+               NPC_S_KPU5_CPT_IP, 0xff,
                0x0000,
                0x0000,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_UDP << 8,
-               0xff00,
-               0x0000,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_TCP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_SCTP << 8,
-               0xff00,
-               0x0000,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_UDP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_ICMP << 8,
-               0xff00,
-               0x0000,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_SCTP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_ICMP6 << 8,
-               0xff00,
-               0x0000,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_ICMP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_ESP << 8,
-               0xff00,
-               0x0000,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_IGMP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_AH << 8,
-               0xff00,
-               0x0000,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_ESP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_GRE << 8,
-               0xff00,
-               0x0000,
-               0x0000,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_AH,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_IP6 << 8,
-               0xff00,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_GRE,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_IP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_MPLS << 8,
-               0xff00,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_IP6,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU5_CPT_IP, 0xff,
+               NPC_IPNH_MPLS,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_ROUT << 8,
-               0xff00,
+               NPC_S_KPU5_CPT_IP, 0xff,
                0x0000,
                0x0000,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               NPC_IPNH_FRAG << 8,
-               0xff00,
+               NPC_S_KPU5_CPT_IP, 0xff,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
-               0x0000,
+               NPC_S_KPU5_CPT_IP6, 0xff,
                0x0000,
+               NPC_IP6_HOP_MASK,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_S_KPU5_CPT_IP6, 0xff,
                NPC_IPNH_TCP << 8,
                0xff00,
-               0x0000,
-               0x0000,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_S_KPU5_CPT_IP6, 0xff,
                NPC_IPNH_UDP << 8,
                0xff00,
-               0x0000,
-               0x0000,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_S_KPU5_CPT_IP6, 0xff,
                NPC_IPNH_SCTP << 8,
                0xff00,
-               0x0000,
-               0x0000,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_S_KPU5_CPT_IP6, 0xff,
                NPC_IPNH_ICMP << 8,
                0xff00,
-               0x0000,
-               0x0000,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_S_KPU5_CPT_IP6, 0xff,
                NPC_IPNH_ICMP6 << 8,
                0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_GRE << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
-               NPC_IPNH_ESP << 8,
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_IP6 << 8,
                0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_MPLS << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
-               NPC_IPNH_AH << 8,
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_HOP << 8,
                0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_DEST << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
-               NPC_IPNH_GRE << 8,
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_ROUT << 8,
                0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_FRAG << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
-               NPC_IPNH_IP6 << 8,
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_ESP << 8,
                0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_AH << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
-               NPC_IPNH_MPLS << 8,
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_MOBILITY << 8,
                0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_HOSTID << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
-               NPC_IPNH_FRAG << 8,
+               NPC_S_KPU5_CPT_IP6, 0xff,
+               NPC_IPNH_SHIM6 << 8,
                0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU5_CPT_IP6, 0xff,
                0x0000,
                0x0000,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_S_KPU5_CPT_IP6, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -5053,11 +5362,11 @@ static struct npc_kpu_profile_cam kpu6_cam_entries[] = {
        },
 };
 
-static struct npc_kpu_profile_cam kpu7_cam_entries[] = {
+static struct npc_kpu_profile_cam kpu6_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU7_IP6_EXT, 0xff,
+               NPC_S_KPU6_IP6_EXT, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -5066,97 +5375,97 @@ static struct npc_kpu_profile_cam kpu7_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_TCP << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_UDP << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_SCTP << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_ICMP << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_ICMP6 << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_ESP << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_AH << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_GRE << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_IP6 << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                NPC_IPNH_MPLS << 8,
                0xff00,
                0x0000,
-               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_S_KPU6_IP6_FRAG, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -5165,237 +5474,223 @@ static struct npc_kpu_profile_cam kpu7_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_TCP << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_UDP << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_SCTP << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_ICMP << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_ICMP6 << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_ESP << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_AH << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_GRE << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_IP6 << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
                NPC_IPNH_MPLS << 8,
                0xff00,
                0x0000,
-               NPC_IP6_FRAG_FRAGOFF,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU7_IP6_FRAG, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
+               NPC_IPNH_ROUT << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_NA, 0X00,
-               0x0000,
-               0x0000,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
+               NPC_IPNH_FRAG << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
-};
-
-static struct npc_kpu_profile_cam kpu8_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU8_TCP, 0xff,
+               NPC_S_KPU6_IP6_HOP_DEST, 0xff,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
-               NPC_TCP_FLAGS_FIN,
-               NPC_TCP_FLAGS_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
-               0x0000,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_TCP << 8,
+               0xff00,
                0x0000,
                0x0000,
-               NPC_TCP_FLAGS_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_UDP << 8,
+               0xff00,
                0x0000,
                0x0000,
-               NPC_TCP_FLAGS_RST|NPC_TCP_FLAGS_FIN,
-               NPC_TCP_FLAGS_RST|NPC_TCP_FLAGS_FIN,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_SCTP << 8,
+               0xff00,
                0x0000,
                0x0000,
-               NPC_TCP_FLAGS_URG|NPC_TCP_FLAGS_SYN,
-               NPC_TCP_FLAGS_URG|NPC_TCP_FLAGS_SYN,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_ICMP << 8,
+               0xff00,
                0x0000,
                0x0000,
-               NPC_TCP_FLAGS_RST|NPC_TCP_FLAGS_SYN,
-               NPC_TCP_FLAGS_RST|NPC_TCP_FLAGS_SYN,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_ICMP6 << 8,
+               0xff00,
                0x0000,
                0x0000,
-               NPC_TCP_FLAGS_SYN|NPC_TCP_FLAGS_FIN,
-               NPC_TCP_FLAGS_SYN|NPC_TCP_FLAGS_FIN,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
-               NPC_TCP_PORT_HTTP,
-               0xffff,
-               NPC_TCP_DATA_OFFSET_5,
-               NPC_TCP_DATA_OFFSET_MASK,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_ESP << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_TCP, 0xff,
-               NPC_TCP_PORT_HTTPS,
-               0xffff,
-               NPC_TCP_DATA_OFFSET_5,
-               NPC_TCP_DATA_OFFSET_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
-               NPC_TCP_PORT_PPTP,
-               0xffff,
-               NPC_TCP_DATA_OFFSET_5,
-               NPC_TCP_DATA_OFFSET_MASK,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_AH << 8,
+               0xff00,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_GRE << 8,
+               0xff00,
                0x0000,
                0x0000,
-               NPC_TCP_DATA_OFFSET_5,
-               NPC_TCP_DATA_OFFSET_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
-               NPC_TCP_PORT_HTTP,
-               0xffff,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_IP6 << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
-               NPC_TCP_PORT_HTTPS,
-               0xffff,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_MPLS << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
-               NPC_TCP_PORT_PPTP,
-               0xffff,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
+               NPC_IPNH_FRAG << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_TCP, 0xff,
+               NPC_S_KPU6_IP6_ROUT, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -5404,97 +5699,97 @@ static struct npc_kpu_profile_cam kpu8_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
-               NPC_UDP_PORT_VXLAN,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_TCP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
-               NPC_UDP_PORT_VXLANGPE,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_UDP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
-               NPC_UDP_PORT_GENEVE,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_SCTP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
-               NPC_UDP_PORT_GTPC,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_ICMP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
-               NPC_UDP_PORT_GTPU,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_ICMP6 << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
-               NPC_UDP_PORT_PTP_E,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_ESP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
-               NPC_UDP_PORT_PTP_G,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_AH << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
-               NPC_UDP_PORT_MPLS,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_GRE << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
-               NPC_UDP_PORT_ESP,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_IP6 << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
+               NPC_IPNH_MPLS << 8,
+               0xff00,
                0x0000,
                0x0000,
-               NPC_UDP_PORT_ESP,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_UDP, 0xff,
+               NPC_S_KPU6_IP6_CPT_FRAG, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -5503,687 +5798,543 @@ static struct npc_kpu_profile_cam kpu8_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU8_SCTP, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_TCP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_ICMP, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_UDP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_IGMP, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_SCTP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_ICMP6, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_ICMP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_AH, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_ICMP6 << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_TRANS_ETH_BR,
-               0xffff,
-               NPC_GRE_F_KEY,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_ESP << 8,
+               0xff00,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_TRANS_ETH_BR,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_AH << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_GRE << 8,
+               0xff00,
+               0x0000,
                0x0000,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
-               NPC_GRE_F_CSUM,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_IP6 << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
-               NPC_GRE_F_KEY,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
-               NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_MPLS << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_ROUT << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
-               NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               NPC_IPNH_FRAG << 8,
+               0xff00,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
                0x0000,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               NPC_GRE_F_CSUM,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_TCP << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               NPC_GRE_F_KEY,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_UDP << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_SCTP << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_ICMP << 8,
+               0xff00,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_ICMP6 << 8,
+               0xff00,
+               0x0000,
                0x0000,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
-               NPC_GRE_F_CSUM,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_ESP << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
-               NPC_GRE_F_KEY,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
-               NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_AH << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_GRE << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
-               NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_IP6 << 8,
+               0xff00,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_MPLS << 8,
+               0xff00,
+               0x0000,
                0x0000,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
-               NPC_GRE_F_CSUM,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
+               NPC_IPNH_FRAG << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
-               NPC_GRE_F_KEY,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
-               NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU6_IP6_CPT_ROUT, 0xff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY,
-               0xffff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_SEQ,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
-               NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_NA, 0X00,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
                0x0000,
                0x0000,
        },
+};
+
+static struct npc_kpu_profile_cam kpu7_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
+               NPC_S_KPU7_IP6_EXT, 0xff,
+               0x0000,
                0x0000,
-               0xffff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               NPC_GRE_F_CSUM,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               NPC_GRE_F_KEY,
-               0xffff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_TCP << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               NPC_GRE_F_SEQ,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY,
-               0xffff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_UDP << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_SEQ,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_SCTP << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               NPC_GRE_F_CSUM|NPC_GRE_F_KEY|NPC_GRE_F_SEQ,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_ICMP << 8,
+               0xff00,
+               0x0000,
                0x0000,
-               0xffff,
-               NPC_GRE_F_ROUTE,
-               0x4fff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_ICMP6 << 8,
+               0xff00,
                0x0000,
-               0xffff,
                0x0000,
-               0x4fff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_ESP << 8,
+               0xff00,
                0x0000,
-               0xffff,
                0x0000,
-               0x0003,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_PPP,
-               0xffff,
-               NPC_GRE_F_KEY|NPC_GRE_VER_1,
-               0xffff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_AH << 8,
+               0xff00,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_PPP,
-               0xffff,
-               NPC_GRE_F_KEY|NPC_GRE_F_SEQ|NPC_GRE_VER_1,
-               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_PPP,
-               0xffff,
-               NPC_GRE_F_KEY|NPC_GRE_F_ACK|NPC_GRE_VER_1,
-               0xffff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_GRE << 8,
+               0xff00,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
-               NPC_ETYPE_PPP,
-               0xffff,
-               NPC_GRE_F_KEY|NPC_GRE_F_SEQ|NPC_GRE_F_ACK|NPC_GRE_VER_1,
-               0xffff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_IP6 << 8,
+               0xff00,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               NPC_IPNH_MPLS << 8,
+               0xff00,
+               0x0000,
                0x0000,
-               0xffff,
-               0x2001,
-               0xef7f,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU8_GRE, 0xff,
+               NPC_S_KPU7_IP6_ROUT, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
                0x0000,
-               0xffff,
-               0x0001,
-               0x0003,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_NA, 0X00,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_TCP << 8,
+               0xff00,
                0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_UDP << 8,
+               0xff00,
                0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
-};
-
-static struct npc_kpu_profile_cam kpu9_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU9_TU_MPLS_IN_GRE, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               0x0000,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_SCTP << 8,
+               0xff00,
                0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_GRE, 0xff,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_ICMP << 8,
+               0xff00,
                0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_GRE, 0xff,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_ICMP6 << 8,
+               0xff00,
+               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_GRE, 0xff,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_ESP << 8,
+               0xff00,
                0x0000,
-               NPC_MPLS_S,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_NSH, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               0x0000,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_AH << 8,
+               0xff00,
                0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_NSH, 0xff,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_GRE << 8,
+               0xff00,
                0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_NSH, 0xff,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_IP6 << 8,
+               0xff00,
+               0x0000,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_NSH, 0xff,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               NPC_IPNH_MPLS << 8,
+               0xff00,
                0x0000,
-               NPC_MPLS_S,
+               NPC_IP6_FRAG_FRAGOFF,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_IP, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
+               NPC_S_KPU7_IP6_FRAG, 0xff,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_IP, 0xff,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_TCP << 8,
+               0xff00,
+               0x0000,
                0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_IP, 0xff,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_UDP << 8,
+               0xff00,
+               0x0000,
+               0x0000,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_IP, 0xff,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_SCTP << 8,
+               0xff00,
+               0x0000,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU9_TU_NSH_IN_GRE, 0xff,
-               NPC_NSH_NP_IP,
-               NPC_NSH_NP_MASK,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_ICMP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_NSH_IN_GRE, 0xff,
-               NPC_NSH_NP_IP6,
-               NPC_NSH_NP_MASK,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_ICMP6 << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_NSH_IN_GRE, 0xff,
-               NPC_NSH_NP_ETH,
-               NPC_NSH_NP_MASK,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_ESP << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_NSH_IN_GRE, 0xff,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_AH << 8,
+               0xff00,
+               0x0000,
                0x0000,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_GRE << 8,
+               0xff00,
+               0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_VXLAN, 0xff,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_IP6 << 8,
+               0xff00,
+               0x0000,
                0x0000,
                0x0000,
-               NPC_VXLAN_I,
-               NPC_VXLAN_I,
                0x0000,
-               0xffff,
        },
        {
-               NPC_S_KPU9_VXLAN, 0xff,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
+               NPC_IPNH_MPLS << 8,
+               0xff00,
                0x0000,
                0x0000,
                0x0000,
-               0xffff,
                0x0000,
-               0xffff,
        },
        {
-               NPC_S_KPU9_VXLAN, 0xff,
+               NPC_S_KPU7_CPT_IP6_FRAG, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -6192,223 +6343,138 @@ static struct npc_kpu_profile_cam kpu9_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU9_VXLANGPE, 0xff,
+               NPC_S_NA, 0X00,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_IP,
-               NPC_VXLANGPE_NP_MASK,
-       },
-       {
-               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_IP6,
-               NPC_VXLANGPE_NP_MASK,
-       },
-       {
-               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_ETH,
-               NPC_VXLANGPE_NP_MASK,
        },
+};
+
+static struct npc_kpu_profile_cam kpu8_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU9_VXLANGPE, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_NSH,
-               NPC_VXLANGPE_NP_MASK,
-       },
-       {
-               NPC_S_KPU9_VXLANGPE, 0xff,
+               NPC_TCP_FLAGS_FIN,
+               NPC_TCP_FLAGS_MASK,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_MPLS,
-               NPC_VXLANGPE_NP_MASK,
        },
        {
-               NPC_S_KPU9_VXLANGPE, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_IP,
-               NPC_VXLANGPE_NP_MASK,
-       },
-       {
-               NPC_S_KPU9_VXLANGPE, 0xff,
+               0x0000,
+               NPC_TCP_FLAGS_MASK,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_IP6,
-               NPC_VXLANGPE_NP_MASK,
        },
        {
-               NPC_S_KPU9_VXLANGPE, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_ETH,
-               NPC_VXLANGPE_NP_MASK,
-       },
-       {
-               NPC_S_KPU9_VXLANGPE, 0xff,
+               NPC_TCP_FLAGS_RST | NPC_TCP_FLAGS_FIN,
+               NPC_TCP_FLAGS_RST | NPC_TCP_FLAGS_FIN,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_NSH,
-               NPC_VXLANGPE_NP_MASK,
        },
        {
-               NPC_S_KPU9_VXLANGPE, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_TCP_FLAGS_URG | NPC_TCP_FLAGS_SYN,
+               NPC_TCP_FLAGS_URG | NPC_TCP_FLAGS_SYN,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P,
-               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
-               NPC_VXLANGPE_NP_MPLS,
-               NPC_VXLANGPE_NP_MASK,
        },
        {
-               NPC_S_KPU9_VXLANGPE, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P,
-               NPC_VXLANGPE_P,
+               NPC_TCP_FLAGS_RST | NPC_TCP_FLAGS_SYN,
+               NPC_TCP_FLAGS_RST | NPC_TCP_FLAGS_SYN,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_VXLANGPE, 0xff,
-               0x0000,
+               NPC_S_KPU8_TCP, 0xff,
                0x0000,
                0x0000,
-               NPC_VXLANGPE_P,
+               NPC_TCP_FLAGS_SYN | NPC_TCP_FLAGS_FIN,
+               NPC_TCP_FLAGS_SYN | NPC_TCP_FLAGS_FIN,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_GENEVE, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_TRANS_ETH_BR,
+               NPC_S_KPU8_TCP, 0xff,
+               NPC_TCP_PORT_HTTP,
                0xffff,
-       },
-       {
-               NPC_S_KPU9_GENEVE, 0xff,
+               NPC_TCP_DATA_OFFSET_5,
+               NPC_TCP_DATA_OFFSET_MASK,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_OAM,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_TRANS_ETH_BR,
-               0xffff,
        },
        {
-               NPC_S_KPU9_GENEVE, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
+               NPC_TCP_PORT_HTTPS,
+               0xffff,
+               NPC_TCP_DATA_OFFSET_5,
+               NPC_TCP_DATA_OFFSET_MASK,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_CRI_OPT,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_TRANS_ETH_BR,
-               0xffff,
        },
        {
-               NPC_S_KPU9_GENEVE, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
+               NPC_TCP_PORT_PPTP,
+               0xffff,
+               NPC_TCP_DATA_OFFSET_5,
+               NPC_TCP_DATA_OFFSET_MASK,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_TRANS_ETH_BR,
-               0xffff,
        },
        {
-               NPC_S_KPU9_GENEVE, 0xff,
-               0x0000,
+               NPC_S_KPU8_TCP, 0xff,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_IP,
-               0xffff,
-       },
-       {
-               NPC_S_KPU9_GENEVE, 0xff,
+               NPC_TCP_DATA_OFFSET_5,
+               NPC_TCP_DATA_OFFSET_MASK,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_OAM,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_IP,
-               0xffff,
        },
        {
-               NPC_S_KPU9_GENEVE, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
+               NPC_TCP_PORT_HTTP,
+               0xffff,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_CRI_OPT,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_IP,
-               0xffff,
-       },
-       {
-               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_IP,
-               0xffff,
        },
        {
-               NPC_S_KPU9_GENEVE, 0xff,
-               0x0000,
+               NPC_S_KPU8_TCP, 0xff,
+               NPC_TCP_PORT_HTTPS,
+               0xffff,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_IP6,
-               0xffff,
-       },
-       {
-               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_OAM,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_IP6,
-               0xffff,
        },
        {
-               NPC_S_KPU9_GENEVE, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
+               NPC_TCP_PORT_PPTP,
+               0xffff,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_CRI_OPT,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_IP6,
-               0xffff,
-       },
-       {
-               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
-               NPC_ETYPE_IP6,
-               0xffff,
        },
        {
-               NPC_S_KPU9_GTPC, 0xff,
+               NPC_S_KPU8_TCP, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -6417,156 +6483,124 @@ static struct npc_kpu_profile_cam kpu9_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU9_GTPU, 0xff,
+               NPC_S_KPU8_UDP, 0xff,
+               NPC_UDP_PORT_VXLAN,
+               0xffff,
                0x0000,
                0x0000,
-               NPC_GTP_PT_GTP | NPC_GTP_VER1 | NPC_GTP_MT_G_PDU,
-               NPC_GTP_PT_MASK | NPC_GTP_VER_MASK | NPC_GTP_MT_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_GTPU, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU8_UDP, 0xff,
+               NPC_UDP_PORT_VXLANGPE,
+               0xffff,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_UDP, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
+               NPC_S_KPU8_UDP, 0xff,
+               NPC_UDP_PORT_GENEVE,
+               0xffff,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_UDP, 0xff,
-               0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
+               NPC_S_KPU8_UDP, 0xff,
+               NPC_UDP_PORT_GTPC,
+               0xffff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU9_TU_MPLS_IN_UDP, 0xff,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU9_TU_MPLS_IN_UDP, 0xff,
+               NPC_S_KPU8_UDP, 0xff,
+               NPC_UDP_PORT_GTPU,
+               0xffff,
+               0x0000,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU9_ESP, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU8_UDP, 0xff,
+               NPC_UDP_PORT_PTP_E,
+               0xffff,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_NA, 0X00,
-               0x0000,
-               0x0000,
+               NPC_S_KPU8_UDP, 0xff,
+               NPC_UDP_PORT_PTP_G,
+               0xffff,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
-};
-
-static struct npc_kpu_profile_cam kpu10_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU10_TU_MPLS, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU8_UDP, 0xff,
+               NPC_UDP_PORT_MPLS,
+               0xffff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU10_TU_MPLS, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_MPLS, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               0x0000,
+               NPC_S_KPU8_UDP, 0xff,
+               NPC_UDP_PORT_ESP,
                0xffff,
                0x0000,
                0x0000,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU10_TU_MPLS, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
+               NPC_S_KPU8_UDP, 0xff,
                0x0000,
                0x0000,
+               NPC_UDP_PORT_ESP,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_MPLS, 0xff,
+               NPC_S_KPU8_UDP, 0xff,
+               0x0000,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_MPLS_PL, 0xff,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
-               0x0000,
-               0x0000,
+               NPC_S_KPU8_SCTP, 0xff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU10_TU_MPLS_PL, 0xff,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_MPLS_PL, 0xff,
+               NPC_S_KPU8_ICMP, 0xff,
+               0x0000,
                0x0000,
-               0xffff,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_MPLS_PL, 0xff,
+               NPC_S_KPU8_IGMP, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -6575,385 +6609,479 @@ static struct npc_kpu_profile_cam kpu10_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_MPLS_IN_VXLANGPE, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               0x0000,
+               NPC_S_KPU8_ICMP6, 0xff,
                0x0000,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU10_TU_MPLS_IN_VXLANGPE, 0xff,
                0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_MPLS_IN_VXLANGPE, 0xff,
+               NPC_S_KPU8_AH, 0xff,
+               0x0000,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-       },
-       {
-               NPC_S_KPU10_TU_MPLS_IN_VXLANGPE, 0xff,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
-               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU10_TU_NSH_IN_VXLANGPE, 0xff,
-               NPC_NSH_NP_IP,
-               NPC_NSH_NP_MASK,
-               0x0000,
-               0x0000,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_TRANS_ETH_BR,
+               0xffff,
+               NPC_GRE_F_KEY,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_NSH_IN_VXLANGPE, 0xff,
-               NPC_NSH_NP_IP6,
-               NPC_NSH_NP_MASK,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_TRANS_ETH_BR,
+               0xffff,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_NSH_IN_VXLANGPE, 0xff,
-               NPC_NSH_NP_ETH,
-               NPC_NSH_NP_MASK,
-               0x0000,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSU,
+               0xffff,
                0x0000,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU10_TU_NSH_IN_VXLANGPE, 0xff,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSU,
+               0xffff,
+               NPC_GRE_F_CSUM,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSU,
+               0xffff,
+               NPC_GRE_F_KEY,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSU,
+               0xffff,
+               NPC_GRE_F_SEQ,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_NA, 0X00,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSU,
+               0xffff,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSU,
+               0xffff,
+               NPC_GRE_F_CSUM | NPC_GRE_F_SEQ,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSU,
+               0xffff,
+               NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
+               0xffff,
                0x0000,
                0x0000,
        },
-};
-
-static struct npc_kpu_profile_cam kpu11_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_IP,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSU,
+               0xffff,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSM,
+               0xffff,
+               0x0000,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_IP6,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSM,
+               0xffff,
+               NPC_GRE_F_CSUM,
                0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSM,
+               0xffff,
+               NPC_GRE_F_KEY,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_ARP,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSM,
+               0xffff,
+               NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSM,
+               0xffff,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSM,
                0xffff,
-               NPC_ETYPE_IP,
+               NPC_GRE_F_CSUM | NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSM,
                0xffff,
-               NPC_ETYPE_IP6,
+               NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_MPLSM,
                0xffff,
-               NPC_ETYPE_ARP,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
                0x0000,
-               0x0000,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
-               NPC_ETYPE_IP,
+               NPC_GRE_F_CSUM,
                0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
-               NPC_ETYPE_IP6,
+               NPC_GRE_F_KEY,
                0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
-               NPC_ETYPE_ARP,
+               NPC_GRE_F_SEQ,
                0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_SBTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_SBTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
-               NPC_ETYPE_IP,
+               NPC_GRE_F_CSUM | NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_SBTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
-               NPC_ETYPE_IP6,
+               NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_SBTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_NSH,
                0xffff,
-               NPC_ETYPE_ARP,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_SBTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP,
                0xffff,
                0x0000,
-               0x0000,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_QINQ,
-               0xffff,
-               NPC_ETYPE_CTAG,
-               0xffff,
+               NPC_S_KPU8_GRE, 0xff,
                NPC_ETYPE_IP,
                0xffff,
+               NPC_GRE_F_CSUM,
+               0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_QINQ,
-               0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP,
                0xffff,
-               NPC_ETYPE_IP6,
+               NPC_GRE_F_KEY,
                0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_QINQ,
-               0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP,
                0xffff,
-               NPC_ETYPE_ARP,
+               NPC_GRE_F_SEQ,
                0xffff,
+               0x0000,
+               0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_QINQ,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP,
                0xffff,
-               NPC_ETYPE_CTAG,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_QINQ,
-               0xffff,
+               NPC_S_KPU8_GRE, 0xff,
                NPC_ETYPE_IP,
                0xffff,
+               NPC_GRE_F_CSUM | NPC_GRE_F_SEQ,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_QINQ,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP,
                0xffff,
-               NPC_ETYPE_IP6,
+               NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_QINQ,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP,
                0xffff,
-               NPC_ETYPE_ARP,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
                0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               NPC_ETYPE_QINQ,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP6,
                0xffff,
                0x0000,
-               0x0000,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               NPC_GRE_F_CSUM,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_PPP, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               NPC_GRE_F_KEY,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               NPC_GRE_F_SEQ,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_MPLS, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_MPLS, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               NPC_GRE_F_CSUM | NPC_GRE_F_SEQ,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_MPLS, 0xff,
-               NPC_MPLS_S,
-               NPC_MPLS_S,
-               0x0000,
-               0x0000,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_MPLS, 0xff,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               NPC_GRE_F_CSUM | NPC_GRE_F_KEY | NPC_GRE_F_SEQ,
+               0xffff,
                0x0000,
-               NPC_MPLS_S,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
                0x0000,
+               0xffff,
+               NPC_GRE_F_ROUTE,
+               0x4fff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_MPLS_PL, 0xff,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU8_GRE, 0xff,
                0x0000,
+               0xffff,
                0x0000,
+               0x4fff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_MPLS_PL, 0xff,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU8_GRE, 0xff,
                0x0000,
+               0xffff,
                0x0000,
+               0x0003,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_MPLS_PL, 0xff,
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_PPP,
+               0xffff,
+               NPC_GRE_F_KEY | NPC_GRE_VER_1,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_PPP,
+               0xffff,
+               NPC_GRE_F_KEY | NPC_GRE_F_SEQ | NPC_GRE_VER_1,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_PPP,
+               0xffff,
+               NPC_GRE_F_KEY | NPC_GRE_F_ACK | NPC_GRE_VER_1,
+               0xffff,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
+               NPC_ETYPE_PPP,
+               0xffff,
+               NPC_GRE_F_KEY | NPC_GRE_F_SEQ | NPC_GRE_F_ACK | NPC_GRE_VER_1,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU11_TU_ETHER_IN_NSH, 0xff,
+               NPC_S_KPU8_GRE, 0xff,
                0x0000,
+               0xffff,
+               0x2001,
+               0xef7f,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU8_GRE, 0xff,
                0x0000,
+               0xffff,
+               0x0001,
+               0x0003,
                0x0000,
                0x0000,
        },
@@ -6968,164 +7096,146 @@ static struct npc_kpu_profile_cam kpu11_cam_entries[] = {
        },
 };
 
-static struct npc_kpu_profile_cam kpu12_cam_entries[] = {
+static struct npc_kpu_profile_cam kpu9_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_TCP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_GRE, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_UDP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_SCTP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_GRE, 0xff,
+               0x0000,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_ICMP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_GRE, 0xff,
                0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_IGMP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_GRE, 0xff,
                0x0000,
+               NPC_MPLS_S,
+               0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_ESP,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_NSH, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_AH,
-               0x00ff,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               0x0000,
+               NPC_S_KPU9_TU_MPLS_IN_NSH, 0xff,
                0x0000,
-               NPC_IP_VER_4|NPC_IP_HDR_LEN_5,
-               NPC_IP_VER_MASK|NPC_IP_HDR_LEN_MASK,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_TCP,
-               0x00ff,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_NSH, 0xff,
                0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_UDP,
-               0x00ff,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_NSH, 0xff,
+               0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_SCTP,
-               0x00ff,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_ICMP,
-               0x00ff,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_IGMP,
-               0x00ff,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 0xff,
+               0x0000,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_ESP,
-               0x00ff,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 0xff,
                0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
-               NPC_IPNH_AH,
-               0x00ff,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 0xff,
+               0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_S_KPU9_TU_NSH_IN_GRE, 0xff,
+               NPC_NSH_NP_IP,
+               NPC_NSH_NP_MASK,
                0x0000,
                0x0000,
-               NPC_IP_VER_4,
-               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_S_KPU9_TU_NSH_IN_GRE, 0xff,
+               NPC_NSH_NP_IP6,
+               NPC_NSH_NP_MASK,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU9_TU_NSH_IN_GRE, 0xff,
+               NPC_NSH_NP_ETH,
+               NPC_NSH_NP_MASK,
+               0x0000,
+               0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_ARP, 0xff,
+               NPC_S_KPU9_TU_NSH_IN_GRE, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -7134,247 +7244,250 @@ static struct npc_kpu_profile_cam kpu12_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_IP6, 0xff,
-               NPC_IPNH_TCP << 8,
-               0xff00,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_VXLAN, 0xff,
+               0x0000,
                0x0000,
+               NPC_VXLAN_I,
+               NPC_VXLAN_I,
                0x0000,
+               0xffff,
        },
        {
-               NPC_S_KPU12_TU_IP6, 0xff,
-               NPC_IPNH_UDP << 8,
-               0xff00,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_VXLAN, 0xff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU12_TU_IP6, 0xff,
-               NPC_IPNH_SCTP << 8,
-               0xff00,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
                0x0000,
+               0xffff,
                0x0000,
+               0xffff,
        },
        {
-               NPC_S_KPU12_TU_IP6, 0xff,
-               NPC_IPNH_ICMP << 8,
-               0xff00,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_VXLAN, 0xff,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU12_TU_IP6, 0xff,
-               NPC_IPNH_ICMP6 << 8,
-               0xff00,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
-       },
-       {
-               NPC_S_KPU12_TU_IP6, 0xff,
-               NPC_IPNH_ESP << 8,
-               0xff00,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU12_TU_IP6, 0xff,
-               NPC_IPNH_AH << 8,
-               0xff00,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_IP,
+               NPC_VXLANGPE_NP_MASK,
        },
        {
-               NPC_S_KPU12_TU_IP6, 0xff,
-               0x0000,
-               0x0000,
-               NPC_IP_VER_6,
-               NPC_IP_VER_MASK,
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_IP6,
+               NPC_VXLANGPE_NP_MASK,
        },
        {
-               NPC_S_KPU12_TU_IP6, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_ETH,
+               NPC_VXLANGPE_NP_MASK,
        },
        {
-               NPC_S_NA, 0X00,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_NSH,
+               NPC_VXLANGPE_NP_MASK,
        },
-};
-
-static struct npc_kpu_profile_cam kpu13_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU13_TU_IP6_EXT, 0xff,
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_MPLS,
+               NPC_VXLANGPE_NP_MASK,
+       },
+       {
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_IP,
+               NPC_VXLANGPE_NP_MASK,
+       },
+       {
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_IP6,
+               NPC_VXLANGPE_NP_MASK,
        },
-};
-
-static struct npc_kpu_profile_cam kpu14_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU14_TU_IP6_EXT, 0xff,
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_ETH,
+               NPC_VXLANGPE_NP_MASK,
+       },
+       {
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_NSH,
+               NPC_VXLANGPE_NP_MASK,
+       },
+       {
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
+               NPC_VXLANGPE_P,
+               NPC_VXLANGPE_P | NPC_VXLANGPE_I,
+               NPC_VXLANGPE_NP_MPLS,
+               NPC_VXLANGPE_NP_MASK,
        },
-};
-
-static struct npc_kpu_profile_cam kpu15_cam_entries[] = {
-       NPC_KPU_NOP_CAM,
-       NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
-               NPC_TCP_FLAGS_FIN,
-               NPC_TCP_FLAGS_MASK,
+               NPC_VXLANGPE_P,
+               NPC_VXLANGPE_P,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_S_KPU9_VXLANGPE, 0xff,
                0x0000,
                0x0000,
                0x0000,
-               NPC_TCP_FLAGS_MASK,
+               NPC_VXLANGPE_P,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               0x0000,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
-               NPC_TCP_FLAGS_RST|NPC_TCP_FLAGS_FIN,
-               NPC_TCP_FLAGS_RST|NPC_TCP_FLAGS_FIN,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_TRANS_ETH_BR,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               0x0000,
-               0x0000,
-               NPC_TCP_FLAGS_URG|NPC_TCP_FLAGS_SYN,
-               NPC_TCP_FLAGS_URG|NPC_TCP_FLAGS_SYN,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_OAM,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_TRANS_ETH_BR,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
-               NPC_TCP_FLAGS_RST|NPC_TCP_FLAGS_SYN,
-               NPC_TCP_FLAGS_RST|NPC_TCP_FLAGS_SYN,
+               NPC_GENEVE_F_CRI_OPT,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_TRANS_ETH_BR,
+               0xffff,
+       },
+       {
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_TRANS_ETH_BR,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               0x0000,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
-               NPC_TCP_FLAGS_SYN|NPC_TCP_FLAGS_FIN,
-               NPC_TCP_FLAGS_SYN|NPC_TCP_FLAGS_FIN,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_IP,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               NPC_TCP_PORT_HTTP,
-               0xffff,
-               NPC_TCP_DATA_OFFSET_5,
-               NPC_TCP_DATA_OFFSET_MASK,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_OAM,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_IP,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               NPC_TCP_PORT_HTTPS,
-               0xffff,
-               NPC_TCP_DATA_OFFSET_5,
-               NPC_TCP_DATA_OFFSET_MASK,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_CRI_OPT,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_IP,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               NPC_TCP_PORT_PPTP,
-               0xffff,
-               NPC_TCP_DATA_OFFSET_5,
-               NPC_TCP_DATA_OFFSET_MASK,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_IP,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               0x0000,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
-               NPC_TCP_DATA_OFFSET_5,
-               NPC_TCP_DATA_OFFSET_MASK,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_IP6,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               NPC_TCP_PORT_HTTP,
-               0xffff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_OAM,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_IP6,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               NPC_TCP_PORT_HTTPS,
-               0xffff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_CRI_OPT,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_IP6,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
-               NPC_TCP_PORT_PPTP,
-               0xffff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_GENEVE, 0xff,
                0x0000,
                0x0000,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_GENEVE_F_OAM | NPC_GENEVE_F_CRI_OPT,
+               NPC_ETYPE_IP6,
+               0xffff,
        },
        {
-               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_S_KPU9_GTPC, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -7383,61 +7496,61 @@ static struct npc_kpu_profile_cam kpu15_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU15_TU_UDP, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_GTPU, 0xff,
                0x0000,
                0x0000,
+               NPC_GTP_PT_GTP | NPC_GTP_VER1 | NPC_GTP_MT_G_PDU,
+               NPC_GTP_PT_MASK | NPC_GTP_VER_MASK | NPC_GTP_MT_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU15_TU_SCTP, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_GTPU, 0xff,
                0x0000,
                0x0000,
+               NPC_GTP_PT_GTP | NPC_GTP_VER1,
+               NPC_GTP_PT_MASK | NPC_GTP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU15_TU_ICMP, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_TU_MPLS_IN_UDP, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU15_TU_IGMP, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_TU_MPLS_IN_UDP, 0xff,
                0x0000,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU15_TU_ICMP6, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_TU_MPLS_IN_UDP, 0xff,
                0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU15_TU_ESP, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_S_KPU9_TU_MPLS_IN_UDP, 0xff,
                0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
                0x0000,
+               NPC_MPLS_S,
        },
        {
-               NPC_S_KPU15_TU_AH, 0xff,
+               NPC_S_KPU9_ESP, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -7456,772 +7569,2511 @@ static struct npc_kpu_profile_cam kpu15_cam_entries[] = {
        },
 };
 
-static struct npc_kpu_profile_cam kpu16_cam_entries[] = {
+static struct npc_kpu_profile_cam kpu10_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
        {
-               NPC_S_KPU16_TCP_DATA, 0xff,
-               0x0000,
-               0x0000,
+               NPC_S_KPU10_TU_MPLS, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU16_HTTP_DATA, 0xff,
+               NPC_S_KPU10_TU_MPLS, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               0x0000,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS, 0xff,
+               0x0000,
+               NPC_MPLS_S,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS_PL, 0xff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS_PL, 0xff,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS_PL, 0xff,
+               0x0000,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS_PL, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS_IN_VXLANGPE, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS_IN_VXLANGPE, 0xff,
+               0x0000,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS_IN_VXLANGPE, 0xff,
+               0x0000,
+               NPC_MPLS_S,
+               0x0000,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+       },
+       {
+               NPC_S_KPU10_TU_MPLS_IN_VXLANGPE, 0xff,
+               0x0000,
+               NPC_MPLS_S,
+               0x0000,
+               NPC_MPLS_S,
+               0x0000,
+               NPC_MPLS_S,
+       },
+       {
+               NPC_S_KPU10_TU_NSH_IN_VXLANGPE, 0xff,
+               NPC_NSH_NP_IP,
+               NPC_NSH_NP_MASK,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_NSH_IN_VXLANGPE, 0xff,
+               NPC_NSH_NP_IP6,
+               NPC_NSH_NP_MASK,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_NSH_IN_VXLANGPE, 0xff,
+               NPC_NSH_NP_ETH,
+               NPC_NSH_NP_MASK,
                0x0000,
                0x0000,
                0x0000,
                0x0000,
+       },
+       {
+               NPC_S_KPU10_TU_NSH_IN_VXLANGPE, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_NA, 0X00,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+};
+
+static struct npc_kpu_profile_cam kpu11_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_IP,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_ARP,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_IP,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_ARP,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_IP,
+               0xffff,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_IP6,
+               0xffff,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_ARP,
+               0xffff,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+               NPC_ETYPE_CTAG,
+               0xffff,
                0x0000,
                0x0000,
        },
        {
-               NPC_S_KPU16_HTTPS_DATA, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+               NPC_ETYPE_IP,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+               NPC_ETYPE_ARP,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_SBTAG,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_IP,
+               0xffff,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_IP6,
+               0xffff,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               NPC_ETYPE_ARP,
+               0xffff,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               NPC_ETYPE_CTAG,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               NPC_ETYPE_IP,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               NPC_ETYPE_IP6,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               NPC_ETYPE_ARP,
+               0xffff,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               NPC_ETYPE_QINQ,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_PPP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_MPLS, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_MPLS, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_MPLS, 0xff,
+               NPC_MPLS_S,
+               NPC_MPLS_S,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_MPLS, 0xff,
+               0x0000,
+               NPC_MPLS_S,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_MPLS_PL, 0xff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_MPLS_PL, 0xff,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_MPLS_PL, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU11_TU_ETHER_IN_NSH, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_NA, 0X00,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+};
+
+static struct npc_kpu_profile_cam kpu12_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_TCP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_UDP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_SCTP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_ICMP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_IGMP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_ESP,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_AH,
+               0x00ff,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_IP_VER_4 | NPC_IP_HDR_LEN_5,
+               NPC_IP_VER_MASK | NPC_IP_HDR_LEN_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_TCP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_UDP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_SCTP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_ICMP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_IGMP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_ESP,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               NPC_IPNH_AH,
+               0x00ff,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_IP_VER_4,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_ARP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP6, 0xff,
+               NPC_IPNH_TCP << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP6, 0xff,
+               NPC_IPNH_UDP << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP6, 0xff,
+               NPC_IPNH_SCTP << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP6, 0xff,
+               NPC_IPNH_ICMP << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP6, 0xff,
+               NPC_IPNH_ICMP6 << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP6, 0xff,
+               NPC_IPNH_ESP << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP6, 0xff,
+               NPC_IPNH_AH << 8,
+               0xff00,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP6, 0xff,
+               0x0000,
+               0x0000,
+               NPC_IP_VER_6,
+               NPC_IP_VER_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU12_TU_IP6, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_NA, 0X00,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+};
+
+static struct npc_kpu_profile_cam kpu13_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       {
+               NPC_S_KPU13_TU_IP6_EXT, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+};
+
+static struct npc_kpu_profile_cam kpu14_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       {
+               NPC_S_KPU14_TU_IP6_EXT, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+};
+
+static struct npc_kpu_profile_cam kpu15_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_TCP_FLAGS_FIN,
+               NPC_TCP_FLAGS_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               NPC_TCP_FLAGS_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_TCP_FLAGS_RST | NPC_TCP_FLAGS_FIN,
+               NPC_TCP_FLAGS_RST | NPC_TCP_FLAGS_FIN,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_TCP_FLAGS_URG | NPC_TCP_FLAGS_SYN,
+               NPC_TCP_FLAGS_URG | NPC_TCP_FLAGS_SYN,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_TCP_FLAGS_RST | NPC_TCP_FLAGS_SYN,
+               NPC_TCP_FLAGS_RST | NPC_TCP_FLAGS_SYN,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_TCP_FLAGS_SYN | NPC_TCP_FLAGS_FIN,
+               NPC_TCP_FLAGS_SYN | NPC_TCP_FLAGS_FIN,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_TCP_PORT_HTTP,
+               0xffff,
+               NPC_TCP_DATA_OFFSET_5,
+               NPC_TCP_DATA_OFFSET_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_TCP_PORT_HTTPS,
+               0xffff,
+               NPC_TCP_DATA_OFFSET_5,
+               NPC_TCP_DATA_OFFSET_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_TCP_PORT_PPTP,
+               0xffff,
+               NPC_TCP_DATA_OFFSET_5,
+               NPC_TCP_DATA_OFFSET_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               0x0000,
+               0x0000,
+               NPC_TCP_DATA_OFFSET_5,
+               NPC_TCP_DATA_OFFSET_MASK,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_TCP_PORT_HTTP,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_TCP_PORT_HTTPS,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               NPC_TCP_PORT_PPTP,
+               0xffff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_TCP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_UDP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_SCTP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_ICMP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_IGMP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_ICMP6, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_ESP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU15_TU_AH, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_NA, 0X00,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+};
+
+static struct npc_kpu_profile_cam kpu16_cam_entries[] = {
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       {
+               NPC_S_KPU16_TCP_DATA, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU16_HTTP_DATA, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU16_HTTPS_DATA, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU16_PPTP_DATA, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU16_UDP_DATA, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+       {
+               NPC_S_KPU16_UDP_PTP, 0xff,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+               0x0000,
+       },
+};
+
+static struct npc_kpu_profile_action kpu1_action_entries[] = {
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 0, 6, 3, 0,
+               NPC_S_KPU5_IP, 14, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 3, 0,
+               NPC_S_KPU5_IP6, 14, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_ARP, 14, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_RARP, 14, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_PTP, 14, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_FCOE, 14, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 0, 0, 0,
+               NPC_S_KPU2_NGIO, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 0, 0, 0,
+               NPC_S_KPU2_CTAG2, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 12, 0, 0,
+               NPC_S_KPU2_CTAG, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 22, 0, 0,
+               NPC_S_KPU2_SBTAG, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_QINQ, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 26, 0, 0,
+               NPC_S_KPU2_ETAG, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_ETAG,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 14, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 14, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 0, 0, 2, 0,
+               NPC_S_KPU4_NSH, 14, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_L_WITH_NSH,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 0, 1, 0,
+               NPC_S_KPU3_DSA, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 0, 2, 0,
+               NPC_S_KPU4_PPPOE, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_8023,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_8023,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 0, 6, 3, 0,
+               NPC_S_KPU5_IP, 22, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 3, 0,
+               NPC_S_KPU5_IP6, 22, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_ARP, 22, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_RARP, 22, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_PTP, 22, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_FCOE, 22, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 0, 0, 0,
+               NPC_S_KPU2_CTAG2, 20, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_CTAG, 20, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 22, 0, 0,
+               NPC_S_KPU2_SBTAG, 20, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_QINQ, 20, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 26, 0, 0,
+               NPC_S_KPU2_ETAG, 20, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_ETAG,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 22, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 22, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 0, 0, 2, 0,
+               NPC_S_KPU4_NSH, 22, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_L_WITH_NSH,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               12, 14, 16, 0, 0,
+               NPC_S_KPU2_PREHEADER, 8, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_8_ETHER,
+               0,
+               1, 0xff, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               12, 14, 16, 0, 0,
+               NPC_S_KPU2_PREHEADER, 4, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_4_ETHER,
+               0,
+               1, 0xff, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               12, 14, 16, 0, 0,
+               NPC_S_KPU2_PREHEADER, 2, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_2_ETHER,
+               0,
+               1, 0xff, 0, 0,
+       },
+       {
+               NPC_ERRLEV_LA, NPC_EC_IH_LENGTH,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 16, 0, 0,
+               NPC_S_KPU2_EXDSA, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 12, 2, 0,
+               NPC_S_KPU4_FDSA, 12, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_LA, NPC_EC_EDSA_UNK,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 0, 6, 3, 0,
+               NPC_S_KPU5_IP, 30, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 3, 0,
+               NPC_S_KPU5_IP6, 30, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_ARP, 30, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_RARP, 30, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_PTP, 30, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_FCOE, 30, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 0, 0, 0,
+               NPC_S_KPU2_CTAG2, 28, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_CTAG, 28, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 22, 0, 0,
+               NPC_S_KPU2_SBTAG, 28, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_QINQ, 28, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 26, 0, 0,
+               NPC_S_KPU2_ETAG, 28, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
+                       | NPC_F_LA_L_WITH_ETAG,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 30, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 30, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 0, 0, 2, 0,
+               NPC_S_KPU4_NSH, 30, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_L_WITH_NSH,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 0, 6, 3, 0,
+               NPC_S_KPU5_IP, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 3, 0,
+               NPC_S_KPU5_IP6, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_ARP, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_RARP, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_PTP, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_FCOE, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 0, 0, 0,
+               NPC_S_KPU2_CTAG2, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
+                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_CTAG, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
+                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 22, 0, 0,
+               NPC_S_KPU2_SBTAG, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
+                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_QINQ, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
+                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 26, 0, 0,
+               NPC_S_KPU2_ETAG, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
+                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_ETAG,
+               0, 0, 0, 0,
        },
        {
-               NPC_S_KPU16_PPTP_DATA, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
+                       | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 0,
        },
        {
-               NPC_S_KPU16_UDP_DATA, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
+                       | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 0,
        },
        {
-               NPC_S_KPU16_UDP_PTP, 0xff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 0, 0, 2, 0,
+               NPC_S_KPU4_NSH, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
+                       | NPC_F_LA_L_WITH_NSH,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
+               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
+                       | NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 0,
        },
-};
-
-static struct npc_kpu_profile_action kpu1_action_entries[] = {
-       NPC_KPU_NOP_ACTION,
-       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 3, 0,
-               NPC_S_KPU5_IP, 14, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU5_IP, 104, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                6, 0, 0, 3, 0,
-               NPC_S_KPU5_IP6, 14, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU5_IP6, 104, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 3, 0,
-               NPC_S_KPU5_ARP, 14, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU5_ARP, 104, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 3, 0,
-               NPC_S_KPU5_RARP, 14, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU5_RARP, 104, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 3, 0,
-               NPC_S_KPU5_PTP, 14, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU5_PTP, 104, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 3, 0,
-               NPC_S_KPU5_FCOE, 14, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU5_FCOE, 104, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 12, 0, 0, 0,
-               NPC_S_KPU2_CTAG2, 12, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU2_CTAG2, 102, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                4, 8, 0, 0, 0,
-               NPC_S_KPU2_CTAG, 12, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU2_CTAG, 102, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                4, 8, 22, 0, 0,
-               NPC_S_KPU2_SBTAG, 12, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU2_SBTAG, 102, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                4, 8, 0, 0, 0,
-               NPC_S_KPU2_QINQ, 12, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU2_QINQ, 102, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 12, 26, 0, 0,
-               NPC_S_KPU2_ETAG, 12, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU2_ETAG, 102, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
                NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_ETAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               18, 22, 26, 0, 0,
-               NPC_S_KPU2_ITAG, 12, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
-               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_ITAG,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 104, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
+               NPC_F_LA_L_WITH_MPLS,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 6, 10, 2, 0,
-               NPC_S_KPU4_MPLS, 14, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU4_MPLS, 104, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
+               NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 0, 0, 2, 0,
+               NPC_S_KPU4_NSH, 104, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
+               NPC_F_LA_L_WITH_NSH,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_90B_ETHER,
+               NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 0, 6, 3, 0,
+               NPC_S_KPU5_CPT_IP, 56, 1,
+               NPC_LID_LA, NPC_LT_LA_CPT_HDR,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 3, 0,
+               NPC_S_KPU5_CPT_IP6, 56, 1,
+               NPC_LID_LA, NPC_LT_LA_CPT_HDR,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_CTAG, 54, 1,
+               NPC_LID_LA, NPC_LT_LA_CPT_HDR,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_QINQ, 54, 1,
+               NPC_LID_LA, NPC_LT_LA_CPT_HDR,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 0, 6, 3, 0,
+               NPC_S_KPU5_CPT_IP, 60, 1,
+               NPC_LID_LA, NPC_LT_LA_CPT_HDR,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 3, 0,
+               NPC_S_KPU5_CPT_IP6, 60, 1,
+               NPC_LID_LA, NPC_LT_LA_CPT_HDR,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_CTAG, 58, 1,
+               NPC_LID_LA, NPC_LT_LA_CPT_HDR,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_QINQ, 58, 1,
+               NPC_LID_LA, NPC_LT_LA_CPT_HDR,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_CPT_HDR,
+               NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 0, 6, 3, 0,
+               NPC_S_KPU5_IP, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 3, 0,
+               NPC_S_KPU5_IP6, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_ARP, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_RARP, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_PTP, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU5_FCOE, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 0, 0, 0,
+               NPC_S_KPU2_CTAG2, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_CTAG, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 22, 0, 0,
+               NPC_S_KPU2_SBTAG, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU2_QINQ, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 12, 26, 0, 0,
+               NPC_S_KPU2_ETAG, 36, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_ETAG,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU4_MPLS, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
                NPC_F_LA_L_WITH_MPLS,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 6, 10, 2, 0,
-               NPC_S_KPU4_MPLS, 14, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU4_MPLS, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
                NPC_F_LA_L_WITH_MPLS,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 0, 0, 2, 0,
-               NPC_S_KPU4_NSH, 14, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
+               NPC_S_KPU4_NSH, 38, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
                NPC_F_LA_L_WITH_NSH,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 12, 0, 1, 0,
-               NPC_S_KPU3_DSA, 12, 1,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LA, NPC_LT_LA_CUSTOM_L2_24B_ETHER,
+               NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               12, 0, 0, 1, 0,
+               NPC_S_KPU3_VLAN_EXDSA, 12, 1,
                NPC_LID_LA, NPC_LT_LA_ETHER,
                0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               NPC_ERRLEV_LA, NPC_EC_L2_K1,
                0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LA, NPC_LT_LA_8023,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LA, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
+};
+
+static struct npc_kpu_profile_action kpu2_action_entries[] = {
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LA, NPC_LT_LA_8023,
+               8, 0, 6, 2, 0,
+               NPC_S_KPU5_IP, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
-               NPC_F_LA_L_UNK_ETYPE,
+               6, 0, 0, 2, 0,
+               NPC_S_KPU5_IP6, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 3, 0,
-               NPC_S_KPU5_IP, 22, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_ARP, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 3, 0,
-               NPC_S_KPU5_IP6, 22, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_RARP, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_ARP, 22, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_PTP, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_RARP, 22, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_FCOE, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_PTP, 22, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_FCOE, 22, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 12, 0, 0, 0,
-               NPC_S_KPU2_CTAG2, 20, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_VLAN,
+               2, 0, 0, 1, 0,
+               NPC_S_KPU4_NSH, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 0, 0, 0,
-               NPC_S_KPU2_CTAG, 20, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_VLAN,
+               8, 0, 6, 2, 0,
+               NPC_S_KPU5_IP, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_PPPOE,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 22, 0, 0,
-               NPC_S_KPU2_SBTAG, 20, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_VLAN,
+               6, 0, 0, 2, 0,
+               NPC_S_KPU5_IP6, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_PPPOE,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 0, 0, 0,
-               NPC_S_KPU2_QINQ, 20, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               NPC_F_LB_U_UNK_ETYPE,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 12, 26, 0, 0,
-               NPC_S_KPU2_ETAG, 20, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_ETAG,
+               8, 0, 6, 2, 0,
+               NPC_S_KPU5_IP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               18, 22, 26, 0, 0,
-               NPC_S_KPU2_ITAG, 20, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_ITAG,
+               6, 0, 0, 2, 0,
+               NPC_S_KPU5_IP6, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 2, 0,
-               NPC_S_KPU4_MPLS, 22, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_ARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 2, 0,
-               NPC_S_KPU4_MPLS, 22, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_RARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 2, 0,
-               NPC_S_KPU4_NSH, 22, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_L_WITH_NSH,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_PTP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_FCOE, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 14, 16, 0, 0,
-               NPC_S_KPU2_PREHEADER, 8, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_8_ETHER,
-               0,
-               1, 0xff, 0, 0,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
+               0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 14, 16, 0, 0,
-               NPC_S_KPU2_PREHEADER, 4, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_4_ETHER,
-               0,
-               1, 0xff, 0, 0,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
+               0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 14, 16, 0, 0,
-               NPC_S_KPU2_PREHEADER, 2, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_2_ETHER,
-               0,
-               1, 0xff, 0, 0,
+               2, 0, 0, 1, 0,
+               NPC_S_KPU4_NSH, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
+               0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LA, NPC_EC_IH_LENGTH,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
-               NPC_F_LA_L_UNK_ETYPE,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG_UNK,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 16, 0, 0,
-               NPC_S_KPU2_EXDSA, 12, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
-               0,
+               2, 6, 0, 0, 0,
+               NPC_S_KPU3_CTAG, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_STAG_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 16, 2, 0,
-               NPC_S_KPU4_FDSA, 12, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
-               0,
+               2, 6, 0, 0, 0,
+               NPC_S_KPU3_STAG, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_STAG_STAG,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LA, NPC_EC_EDSA_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LA, NPC_LT_LA_ETHER,
-               0,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 0, 6, 2, 0,
+               NPC_S_KPU5_IP, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 3, 0,
-               NPC_S_KPU5_IP, 30, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2,
+               6, 0, 0, 2, 0,
+               NPC_S_KPU5_IP6, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 3, 0,
-               NPC_S_KPU5_IP6, 30, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_ARP, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_ARP, 30, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_RARP, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_RARP, 30, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_PTP, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_PTP, 30, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_FCOE, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_FCOE, 30, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 12, 0, 0, 0,
-               NPC_S_KPU2_CTAG2, 28, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_VLAN,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 0, 0, 0,
-               NPC_S_KPU2_CTAG, 28, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_VLAN,
+               2, 0, 0, 1, 0,
+               NPC_S_KPU4_NSH, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 22, 0, 0,
-               NPC_S_KPU2_SBTAG, 28, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_VLAN,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU3_STAG, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG_STAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 0, 0, 0,
-               NPC_S_KPU2_QINQ, 28, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_VLAN,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU3_CTAG, 24, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 12, 26, 0, 0,
-               NPC_S_KPU2_ETAG, 28, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_ETAG,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_BTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG_UNK,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               18, 22, 26, 0, 0,
-               NPC_S_KPU2_ITAG, 28, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_U_HAS_TAG
-                       | NPC_F_LA_L_WITH_ITAG,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_UNK_ETYPE,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 2, 0,
-               NPC_S_KPU4_MPLS, 30, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_L_WITH_MPLS,
+               8, 0, 6, 2, 0,
+               NPC_S_KPU5_IP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 2, 0,
-               NPC_S_KPU4_MPLS, 30, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_L_WITH_MPLS,
+               6, 0, 0, 2, 0,
+               NPC_S_KPU5_IP6, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 2, 0,
-               NPC_S_KPU4_NSH, 30, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_L_WITH_NSH,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_ARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LA, NPC_LT_LA_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_HIGIG2 | NPC_F_LA_L_UNK_ETYPE,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_RARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 3, 0,
-               NPC_S_KPU5_IP, 38, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_PTP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 3, 0,
-               NPC_S_KPU5_IP6, 38, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_FCOE, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_ARP, 38, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_RARP, 38, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_PTP, 38, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               2, 0, 0, 1, 0,
+               NPC_S_KPU4_NSH, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 3, 0,
-               NPC_S_KPU5_FCOE, 38, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG_UNK,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 12, 0, 0, 0,
-               NPC_S_KPU2_CTAG2, 36, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               2, 6, 0, 0, 0,
+               NPC_S_KPU3_CTAG, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_QINQ_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 0, 0, 0,
-               NPC_S_KPU2_CTAG, 36, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               2, 6, 0, 0, 0,
+               NPC_S_KPU3_QINQ, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_QINQ_QINQ,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 22, 0, 0,
-               NPC_S_KPU2_SBTAG, 36, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_F_LB_U_UNK_ETYPE,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 0, 0, 0,
-               NPC_S_KPU2_QINQ, 36, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_VLAN,
+               8, 0, 6, 2, 0,
+               NPC_S_KPU5_IP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 12, 26, 0, 0,
-               NPC_S_KPU2_ETAG, 36, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_ETAG,
+               6, 0, 0, 2, 0,
+               NPC_S_KPU5_IP6, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               18, 22, 26, 0, 0,
-               NPC_S_KPU2_ITAG, 36, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_U_HAS_TAG | NPC_F_LA_L_WITH_ITAG,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_ARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 2, 0,
-               NPC_S_KPU4_MPLS, 38, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_RARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 2, 0,
-               NPC_S_KPU4_MPLS, 38, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_L_WITH_MPLS,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_PTP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 2, 0,
-               NPC_S_KPU4_NSH, 38, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_L_WITH_NSH,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU5_FCOE, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-               NPC_F_LA_U_HAS_IH_NIX | NPC_F_LA_U_HAS_HIGIG2
-                       | NPC_F_LA_L_UNK_ETYPE,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               1,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LA, NPC_EC_L2_K1,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LA, NPC_LT_NA,
-               0,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               2,
                0, 0, 0, 0,
        },
-};
-
-static struct npc_kpu_profile_action kpu2_action_entries[] = {
-       NPC_KPU_NOP_ACTION,
-       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_NSH, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               2,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU3_CTAG, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 0, 0, 0,
+               NPC_S_KPU3_STAG, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_STAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               2, 6, 0, 0, 0,
+               NPC_S_KPU3_QINQ, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_QINQ,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_RARP, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               8, 0, 6, 2, 0,
+               NPC_S_KPU5_IP, 28, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_PTP, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               6, 0, 0, 2, 0,
+               NPC_S_KPU5_IP6, 28, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 2, 0,
-               NPC_S_KPU5_FCOE, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               NPC_S_KPU5_ARP, 28, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU3_STAG, 28, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG_STAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU3_CTAG, 28, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG_CTAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 1, 0,
-               NPC_S_KPU4_NSH, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_ITAG_UNK,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
+               NPC_LID_LB, NPC_LT_LB_ETAG,
                NPC_F_LB_U_UNK_ETYPE,
                0, 0, 0, 0,
        },
@@ -8230,7 +10082,7 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
                8, 0, 6, 2, 0,
                NPC_S_KPU5_IP, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
@@ -8238,7 +10090,7 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
                6, 0, 0, 2, 0,
                NPC_S_KPU5_IP6, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
@@ -8246,7 +10098,7 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
                0, 0, 0, 2, 0,
                NPC_S_KPU5_ARP, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
@@ -8254,7 +10106,7 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
                0, 0, 0, 2, 0,
                NPC_S_KPU5_RARP, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
@@ -8262,7 +10114,7 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
                0, 0, 0, 2, 0,
                NPC_S_KPU5_PTP, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
@@ -8270,7 +10122,7 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
                0, 0, 0, 2, 0,
                NPC_S_KPU5_FCOE, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
@@ -8278,7 +10130,7 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
                2, 6, 10, 1, 0,
                NPC_S_KPU4_MPLS, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
@@ -8286,7 +10138,7 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
                2, 6, 10, 1, 0,
                NPC_S_KPU4_MPLS, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
@@ -8294,2000 +10146,1912 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
                2, 0, 0, 1, 0,
                NPC_S_KPU4_NSH, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG_UNK,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 6, 0, 0, 0,
-               NPC_S_KPU3_CTAG, 10, 1,
+               NPC_S_KPU3_QINQ, 10, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_STAG_CTAG,
+               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_QINQ_QINQ,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_STAG, 10, 1,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
                NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_STAG_STAG,
+               NPC_F_LB_U_UNK_ETYPE,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               NPC_S_KPU5_IP, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               NPC_S_KPU5_IP6, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               NPC_S_KPU5_ARP, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 2, 0,
-               NPC_S_KPU5_RARP, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               NPC_S_KPU5_RARP, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 2, 0,
-               NPC_S_KPU5_PTP, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               NPC_S_KPU5_PTP, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 2, 0,
-               NPC_S_KPU5_FCOE, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               NPC_S_KPU5_FCOE, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               2, 6, 0, 0, 0,
+               NPC_S_KPU3_CTAG_C, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 1, 0,
-               NPC_S_KPU4_NSH, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               2, 6, 20, 0, 0,
+               NPC_S_KPU3_STAG_C, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU3_STAG, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG_STAG,
+               2, 6, 0, 0, 0,
+               NPC_S_KPU3_QINQ_C, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU3_CTAG, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG_CTAG,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_BTAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG_UNK,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU4_MPLS, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_UNK_ETYPE,
+               2, 0, 0, 1, 0,
+               NPC_S_KPU4_NSH, 14, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
+               NPC_S_KPU5_IP, 18, 1,
+               NPC_LID_LB, NPC_LT_LB_EDSA,
+               NPC_F_LB_L_EDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
+               NPC_S_KPU5_IP6, 18, 1,
+               NPC_LID_LB, NPC_LT_LB_EDSA,
+               NPC_F_LB_L_EDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
+               NPC_S_KPU5_ARP, 18, 1,
+               NPC_LID_LB, NPC_LT_LB_EDSA,
+               NPC_F_LB_L_EDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_RARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
+               8, 0, 6, 2, 0,
+               NPC_S_KPU5_RARP, 18, 1,
+               NPC_LID_LB, NPC_LT_LB_EDSA,
+               NPC_F_LB_L_EDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_PTP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
+               6, 0, 0, 2, 0,
+               NPC_S_KPU5_PTP, 18, 1,
+               NPC_LID_LB, NPC_LT_LB_EDSA,
+               NPC_F_LB_L_EDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 2, 0,
-               NPC_S_KPU5_FCOE, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 1, 0,
-               NPC_S_KPU4_NSH, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_CTAG_UNK,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_CTAG, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_QINQ_CTAG,
+               NPC_S_KPU5_FCOE, 18, 1,
+               NPC_LID_LB, NPC_LT_LB_EDSA,
+               NPC_F_LB_L_EDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_QINQ, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_QINQ_QINQ,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU3_CTAG, 16, 1,
+               NPC_LID_LB, NPC_LT_LB_EDSA_VLAN,
+               NPC_F_LB_L_EDSA_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_UNK_ETYPE,
+               NPC_LID_LB, NPC_LT_LB_EDSA,
+               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_EDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 2, 0,
                NPC_S_KPU5_IP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               0,
+               NPC_LID_LB, NPC_LT_LB_EXDSA,
+               NPC_F_LB_L_EXDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                6, 0, 0, 2, 0,
                NPC_S_KPU5_IP6, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               0,
+               NPC_LID_LB, NPC_LT_LB_EXDSA,
+               NPC_F_LB_L_EXDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 2, 0,
                NPC_S_KPU5_ARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               0,
+               NPC_LID_LB, NPC_LT_LB_EXDSA,
+               NPC_F_LB_L_EXDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
+               8, 0, 6, 2, 0,
                NPC_S_KPU5_RARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               0,
+               NPC_LID_LB, NPC_LT_LB_EXDSA,
+               NPC_F_LB_L_EXDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
+               6, 0, 0, 2, 0,
                NPC_S_KPU5_PTP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               0,
+               NPC_LID_LB, NPC_LT_LB_EXDSA,
+               NPC_F_LB_L_EXDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 2, 0,
                NPC_S_KPU5_FCOE, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               0,
+               NPC_LID_LB, NPC_LT_LB_EXDSA,
+               NPC_F_LB_L_EXDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               1,
+               4, 8, 0, 0, 0,
+               NPC_S_KPU3_CTAG, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_EXDSA_VLAN,
+               NPC_F_LB_L_EXDSA_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               2,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_EXDSA,
+               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_EXDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_NSH, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               2,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_NGIO,
+               0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU3_CTAG, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               NPC_ERRLEV_LB, NPC_EC_L2_K3,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
+};
+
+static struct npc_kpu_profile_action kpu3_action_entries[] = {
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               16, 20, 24, 0, 0,
-               NPC_S_KPU3_ITAG, 14, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_BTAG_ITAG,
+               8, 0, 6, 1, 0,
+               NPC_S_KPU5_IP, 6, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_STAG, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_STAG,
+               6, 0, 0, 1, 0,
+               NPC_S_KPU5_IP6, 6, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_QINQ, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_QINQ,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_ARP, 6, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 28, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_RARP, 6, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 28, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_PTP, 6, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 28, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_FCOE, 6, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU3_STAG, 28, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG_STAG,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 6, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU3_CTAG, 28, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG_CTAG,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 6, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_ITAG_UNK,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU4_NSH, 6, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
                0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_ETAG,
-               NPC_F_LB_U_UNK_ETYPE,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 20, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 20, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
+               8, 0, 6, 1, 0,
+               NPC_S_KPU5_IP, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 20, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
+               6, 0, 0, 1, 0,
+               NPC_S_KPU5_IP6, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_RARP, 20, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_ARP, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 28, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_STAG_CTAG,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_RARP, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 28, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_STAG_CTAG,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_PTP, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 28, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_STAG_CTAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_FCOE, 8, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_STAG,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_STAG,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_STAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU4_NSH, 8, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               8, 0, 6, 1, 0,
+               NPC_S_KPU5_IP, 4, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
+               6, 0, 0, 1, 0,
+               NPC_S_KPU5_IP6, 4, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 24, 1,
-               NPC_LID_LB, NPC_LT_LB_ITAG,
-               NPC_F_LB_U_MORE_TAG|NPC_F_LB_L_WITH_CTAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_ARP, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_RARP, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 4, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 4, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU4_NSH, 4, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_RARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_PTP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               8, 0, 6, 1, 0,
+               NPC_S_KPU5_IP, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_FCOE, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               6, 0, 0, 1, 0,
+               NPC_S_KPU5_IP6, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_ARP, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_RARP, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 1, 0,
-               NPC_S_KPU4_NSH, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_PTP, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_QINQ, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_MORE_TAG | NPC_F_LB_L_WITH_QINQ_QINQ,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_FCOE, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               NPC_F_LB_U_UNK_ETYPE,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 14, 0,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 8, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 14, 0,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU4_NSH, 8, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 14, 0,
+               8, 0, 6, 1, 0,
+               NPC_S_KPU5_IP, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_RARP, 14, 0,
+               6, 0, 0, 1, 0,
+               NPC_S_KPU5_IP6, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_PTP, 14, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_ARP, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_FCOE, 14, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_RARP, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_CTAG_C, 14, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_PTP, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 20, 0, 0,
-               NPC_S_KPU3_STAG_C, 14, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_FCOE, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_QINQ_C, 14, 0,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 14, 0,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 14, 0,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU4_NSH, 4, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 1, 0,
-               NPC_S_KPU4_NSH, 14, 0,
+               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 18, 1,
-               NPC_LID_LB, NPC_LT_LB_EDSA,
-               NPC_F_LB_L_EDSA,
+               8, 0, 6, 1, 0,
+               NPC_S_KPU5_IP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 18, 1,
-               NPC_LID_LB, NPC_LT_LB_EDSA,
-               NPC_F_LB_L_EDSA,
+               6, 0, 0, 1, 0,
+               NPC_S_KPU5_IP6, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 18, 1,
-               NPC_LID_LB, NPC_LT_LB_EDSA,
-               NPC_F_LB_L_EDSA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_ARP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_RARP, 18, 1,
-               NPC_LID_LB, NPC_LT_LB_EDSA,
-               NPC_F_LB_L_EDSA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_RARP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_PTP, 18, 1,
-               NPC_LID_LB, NPC_LT_LB_EDSA,
-               NPC_F_LB_L_EDSA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_PTP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_FCOE, 18, 1,
-               NPC_LID_LB, NPC_LT_LB_EDSA,
-               NPC_F_LB_L_EDSA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_FCOE, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 0, 0, 0,
-               NPC_S_KPU3_CTAG, 16, 1,
-               NPC_LID_LB, NPC_LT_LB_EDSA_VLAN,
-               NPC_F_LB_L_EDSA_VLAN,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_EDSA,
-               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_EDSA,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_EXDSA,
-               NPC_F_LB_L_EXDSA,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU4_NSH, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_EXDSA,
-               NPC_F_LB_L_EXDSA,
+               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_CTAG,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_EXDSA,
-               NPC_F_LB_L_EXDSA,
+               8, 0, 6, 1, 0,
+               NPC_S_KPU5_IP, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_RARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_EXDSA,
-               NPC_F_LB_L_EXDSA,
+               6, 0, 0, 1, 0,
+               NPC_S_KPU5_IP6, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_PTP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_EXDSA,
-               NPC_F_LB_L_EXDSA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_ARP, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_FCOE, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_EXDSA,
-               NPC_F_LB_L_EXDSA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_RARP, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               4, 8, 0, 0, 0,
-               NPC_S_KPU3_CTAG, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_EXDSA_VLAN,
-               NPC_F_LB_L_EXDSA_VLAN,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_PTP, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_EXDSA,
-               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_EXDSA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_FCOE, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
-};
-
-static struct npc_kpu_profile_action kpu3_action_entries[] = {
-       NPC_KPU_NOP_ACTION,
-       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU4_NSH, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               8, 0, 6, 1, 0,
+               NPC_S_KPU5_IP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               6, 0, 0, 1, 0,
+               NPC_S_KPU5_IP6, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_ARP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_RARP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU4_MPLS, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU4_MPLS, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU4_NSH, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
                0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_IP, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_IP6, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_ARP, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_RARP, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_PTP, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_FCOE, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU4_MPLS, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU4_MPLS, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU4_NSH, 8, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_IP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_IP6, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_ARP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_KPU5_RARP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_PTP, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_FCOE, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               2, 6, 10, 0, 0,
+               NPC_S_KPU4_MPLS, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               2, 0, 0, 0, 0,
+               NPC_S_KPU4_NSH, 4, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               8, 0, 6, 1, 0,
+               NPC_S_KPU5_IP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA,
+               NPC_F_LB_L_DSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               6, 0, 0, 1, 0,
+               NPC_S_KPU5_IP6, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA,
+               NPC_F_LB_L_DSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_S_KPU5_ARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA,
+               NPC_F_LB_L_DSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_RARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA,
+               NPC_F_LB_L_DSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_PTP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA,
+               NPC_F_LB_L_DSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU5_FCOE, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA,
+               NPC_F_LB_L_DSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_S_KPU5_IP, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
+               NPC_F_LB_L_DSA_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_S_KPU5_IP6, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
+               NPC_F_LB_L_DSA_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_S_KPU5_ARP, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
+               NPC_F_LB_L_DSA_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_S_KPU5_RARP, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
+               NPC_F_LB_L_DSA_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_S_KPU5_PTP, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
+               NPC_F_LB_L_DSA_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_S_KPU5_FCOE, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
+               NPC_F_LB_L_DSA_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
+               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_DSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LB, NPC_LT_LB_DSA,
+               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_DSA_VLAN,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU4_VLAN_EXDSA, 12, 1,
+               NPC_LID_LB, NPC_LT_LB_VLAN_EXDSA,
                0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
+               NPC_ERRLEV_LB, NPC_EC_L2_K3,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 0,
                NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
+};
+
+static struct npc_kpu_profile_action kpu4_action_entries[] = {
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 18, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 18, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 18, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_RARP, 18, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU5_MPLS_PL, 4, 1,
+               NPC_LID_LC, NPC_LT_LC_MPLS,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 26, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU5_MPLS_PL, 8, 1,
+               NPC_LID_LC, NPC_LT_LC_MPLS,
+               NPC_F_LC_L_MPLS_2_LABELS,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 26, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU5_MPLS_PL, 12, 1,
+               NPC_LID_LC, NPC_LT_LC_MPLS,
+               NPC_F_LC_L_MPLS_3_LABELS,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 26, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               2, 4, 0, 0, 0,
+               NPC_S_KPU5_MPLS, 12, 1,
+               NPC_LID_LC, NPC_LT_LC_MPLS,
+               NPC_F_LC_L_MPLS_4_LABELS,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 22, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               8, 0, 6, 7, 0,
+               NPC_S_KPU12_TU_IP, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_NSH,
                0,
-               0, 0, 0, 0,
+               1, 0x3f, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 22, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               6, 0, 0, 7, 0,
+               NPC_S_KPU12_TU_IP6, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_NSH,
                0,
-               0, 0, 0, 0,
+               1, 0x3f, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 22, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               12, 16, 20, 6, 0,
+               NPC_S_KPU11_TU_ETHER, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_NSH,
                0,
-               0, 0, 0, 0,
+               1, 0x3f, 0, 2,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 4, 0,
+               NPC_S_KPU9_TU_MPLS_IN_NSH, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_NSH,
                0,
-               0, 0, 0, 0,
+               1, 0x3f, 0, 2,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
+               NPC_ERRLEV_LC, NPC_EC_NSH_UNK,
                0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_NSH,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 22, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               8, 0, 6, 0, 0,
+               NPC_S_KPU5_IP, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 22, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               6, 0, 0, 0, 0,
+               NPC_S_KPU5_IP6, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 22, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU5_ARP, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               8, 0, 6, 0, 0,
+               NPC_S_KPU5_RARP, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 0, 0,
+               NPC_S_KPU5_PTP, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU5_FCOE, 6, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               8, 0, 6, 0, 0,
+               NPC_S_KPU5_IP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               6, 0, 0, 0, 0,
+               NPC_S_KPU5_IP6, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU5_ARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               8, 0, 6, 0, 0,
+               NPC_S_KPU5_RARP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               6, 0, 0, 0, 0,
+               NPC_S_KPU5_PTP, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU5_FCOE, 10, 1,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
+               8, 0, 6, 0, 0,
+               NPC_S_KPU5_IP, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_PPPOE,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
+               6, 0, 0, 0, 0,
+               NPC_S_KPU5_IP6, 14, 1,
+               NPC_LID_LB, NPC_LT_LB_PPPOE,
                0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_CTAG,
-               0,
+               NPC_LID_LB, NPC_LT_LB_FDSA,
+               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_FDSA,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               8, 0, 6, 0, 0,
+               NPC_S_KPU5_IP, 2, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               6, 0, 0, 0, 0,
+               NPC_S_KPU5_IP6, 2, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU5_ARP, 2, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               8, 0, 6, 0, 0,
+               NPC_S_KPU5_RARP, 2, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               6, 0, 0, 0, 0,
+               NPC_S_KPU5_PTP, 2, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU5_FCOE, 2, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               8, 0, 6, 0, 0,
+               NPC_S_KPU5_IP, 10, 0,
+               NPC_LID_LB, NPC_LT_LB_PPPOE,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               6, 0, 0, 0, 0,
+               NPC_S_KPU5_IP6, 10, 0,
+               NPC_LID_LB, NPC_LT_LB_PPPOE,
                0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_ERRLEV_LB, NPC_EC_L2_K4,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
+};
+
+static struct npc_kpu_profile_action kpu5_action_entries[] = {
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_ERRLEV_LC, NPC_EC_IP_TTL_0,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
        {
+               NPC_ERRLEV_LC, NPC_EC_IP_FRAG_OFFSET_1,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
+               NPC_F_LC_U_IP_FRAG,
+               0, 0, 0, 0,
+       },
+       {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               2, 12, 0, 2, 0,
+               NPC_S_KPU8_TCP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               2, 0, 0, 2, 0,
+               NPC_S_KPU8_UDP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_SCTP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_ICMP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_IGMP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU9_ESP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_AH, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               2, 0, 0, 2, 0,
+               NPC_S_KPU8_GRE, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               0,
+               8, 0, 6, 6, 0,
+               NPC_S_KPU12_TU_IP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
+               NPC_F_LC_L_IP_IN_IP,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               0,
+               6, 0, 0, 6, 0,
+               NPC_S_KPU12_TU_IP6, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
+               NPC_F_LC_L_6TO4,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               0,
+               2, 6, 10, 3, 0,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
+               NPC_F_LC_L_MPLS_IN_IP,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               0,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
+               NPC_F_LC_U_UNK_PROTO,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               0,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
+               NPC_F_LC_U_IP_FRAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               2, 12, 0, 2, 0,
+               NPC_S_KPU8_TCP, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
                0,
-               0, 0, 0, 0,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 8, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               2, 8, 10, 2, 0,
+               NPC_S_KPU8_UDP, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
                0,
-               0, 0, 0, 0,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_SCTP, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
                0,
-               0, 0, 0, 0,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_ICMP, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
                0,
-               0, 0, 0, 0,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_IGMP, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
                0,
-               0, 0, 0, 0,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU9_ESP, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
                0,
-               0, 0, 0, 0,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_AH, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
                0,
-               0, 0, 0, 0,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
+               2, 0, 0, 2, 0,
+               NPC_S_KPU8_GRE, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
                0,
-               0, 0, 0, 0,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               0,
-               0, 0, 0, 0,
+               8, 0, 6, 6, 0,
+               NPC_S_KPU12_TU_IP, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
+               NPC_F_LC_L_IP_IN_IP,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 0, 0,
-               NPC_S_KPU4_MPLS, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               0,
-               0, 0, 0, 0,
+               6, 0, 0, 6, 0,
+               NPC_S_KPU12_TU_IP6, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
+               NPC_F_LC_L_6TO4,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 0, 0,
-               NPC_S_KPU4_NSH, 4, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               0,
-               0, 0, 0, 0,
+               2, 6, 10, 3, 0,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
+               NPC_F_LC_L_MPLS_IN_IP,
+               0, 0xf, 0, 2,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3_ETYPE_UNK,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_STAG_QINQ,
-               0,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
+               NPC_F_LC_U_UNK_PROTO,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA,
-               NPC_F_LB_L_DSA,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
+               NPC_F_LC_U_IP_FRAG,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA,
-               NPC_F_LB_L_DSA,
+               NPC_ERRLEV_LC, NPC_EC_IP_VER,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA,
-               NPC_F_LB_L_DSA,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_ARP,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA,
-               NPC_F_LB_L_DSA,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_RARP,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA,
-               NPC_F_LB_L_DSA,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_PTP,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 10, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA,
-               NPC_F_LB_L_DSA,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_FCOE,
+               0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 1, 0,
-               NPC_S_KPU5_IP, 14, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
-               NPC_F_LB_L_DSA_VLAN,
+               NPC_ERRLEV_LC, NPC_EC_IP6_HOP_0,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 1, 0,
-               NPC_S_KPU5_IP6, 14, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
-               NPC_F_LB_L_DSA_VLAN,
+               2, 12, 0, 2, 0,
+               NPC_S_KPU8_TCP, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_ARP, 14, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
-               NPC_F_LB_L_DSA_VLAN,
+               2, 0, 0, 2, 0,
+               NPC_S_KPU8_UDP, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_RARP, 14, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
-               NPC_F_LB_L_DSA_VLAN,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_SCTP, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_PTP, 14, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
-               NPC_F_LB_L_DSA_VLAN,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_ICMP, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 1, 0,
-               NPC_S_KPU5_FCOE, 14, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
-               NPC_F_LB_L_DSA_VLAN,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_ICMP6, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA_VLAN,
-               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_DSA,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_GRE, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_DSA,
-               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_DSA_VLAN,
+               6, 0, 0, 6, 0,
+               NPC_S_KPU12_TU_IP6, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               NPC_F_LC_L_IP6_TUN_IP6,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K3,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 3, 0,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               NPC_F_LC_L_IP6_MPLS_IN_IP,
                0, 0, 0, 0,
        },
-};
-
-static struct npc_kpu_profile_action kpu4_action_entries[] = {
-       NPC_KPU_NOP_ACTION,
-       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 0,
-               NPC_S_KPU5_MPLS_PL, 4, 1,
-               NPC_LID_LC, NPC_LT_LC_MPLS,
-               0,
+               NPC_S_KPU6_IP6_HOP_DEST, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
+               NPC_F_LC_L_EXT_HOP,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 0,
-               NPC_S_KPU5_MPLS_PL, 8, 1,
-               NPC_LID_LC, NPC_LT_LC_MPLS,
-               NPC_F_LC_L_MPLS_2_LABELS,
+               NPC_S_KPU6_IP6_HOP_DEST, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
+               NPC_F_LC_L_EXT_DEST,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 0,
-               NPC_S_KPU5_MPLS_PL, 12, 1,
-               NPC_LID_LC, NPC_LT_LC_MPLS,
-               NPC_F_LC_L_MPLS_3_LABELS,
+               NPC_S_KPU6_IP6_ROUT, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
+               NPC_F_LC_L_EXT_ROUT,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 4, 0, 0, 0,
-               NPC_S_KPU5_MPLS, 12, 1,
-               NPC_LID_LC, NPC_LT_LC_MPLS,
-               NPC_F_LC_L_MPLS_4_LABELS,
+               0, 2, 0, 0, 0,
+               NPC_S_KPU6_IP6_FRAG, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
+               NPC_F_LC_U_IP6_FRAG,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 7, 0,
-               NPC_S_KPU12_TU_IP, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_NSH,
+               0, 0, 0, 3, 0,
+               NPC_S_KPU9_ESP, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
                0,
-               1, 0x3f, 0, 2,
+               0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 7, 0,
-               NPC_S_KPU12_TU_IP6, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_NSH,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU8_AH, 40, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
                0,
-               1, 0x3f, 0, 2,
+               0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 16, 20, 6, 0,
-               NPC_S_KPU11_TU_ETHER, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_NSH,
-               0,
-               1, 0x3f, 0, 2,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
+               NPC_F_LC_L_EXT_MOBILITY,
+               0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 4, 0,
-               NPC_S_KPU9_TU_MPLS_IN_NSH, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_NSH,
-               0,
-               1, 0x3f, 0, 2,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
+               NPC_F_LC_L_EXT_HOSTID,
+               0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LC, NPC_EC_NSH_UNK,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_NSH,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
+               NPC_F_LC_L_EXT_SHIM6,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               NPC_F_LC_U_UNK_PROTO,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_LC, NPC_EC_IP6_VER,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 0, 0,
-               NPC_S_KPU5_IP, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_FDSA,
-               NPC_F_LB_L_FDSA,
+               8, 0, 6, 6, 0,
+               NPC_S_KPU12_TU_IP, 4, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 0, 0,
-               NPC_S_KPU5_IP6, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_FDSA,
-               NPC_F_LB_L_FDSA,
+               6, 0, 0, 6, 0,
+               NPC_S_KPU12_TU_IP6, 4, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 0,
-               NPC_S_KPU5_ARP, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_FDSA,
-               NPC_F_LB_L_FDSA,
+               12, 16, 20, 5, 0,
+               NPC_S_KPU11_TU_ETHER, 8, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 0, 0,
-               NPC_S_KPU5_RARP, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_FDSA,
-               NPC_F_LB_L_FDSA,
+               12, 16, 20, 5, 0,
+               NPC_S_KPU11_TU_ETHER, 4, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_LB, NPC_EC_MPLS_2MANY,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 0, 0,
-               NPC_S_KPU5_PTP, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_FDSA,
-               NPC_F_LB_L_FDSA,
+               8, 0, 6, 6, 0,
+               NPC_S_KPU12_TU_IP, 0, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 0,
-               NPC_S_KPU5_FCOE, 6, 1,
-               NPC_LID_LB, NPC_LT_LB_FDSA,
-               NPC_F_LB_L_FDSA,
+               6, 0, 0, 6, 0,
+               NPC_S_KPU12_TU_IP6, 0, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LB, NPC_LT_LB_FDSA,
-               NPC_F_LB_U_UNK_ETYPE | NPC_F_LB_L_FDSA,
+               12, 16, 20, 5, 0,
+               NPC_S_KPU11_TU_ETHER, 4, 0,
+               NPC_LID_LB, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_L2_K4,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LC, NPC_LT_NA,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               12, 16, 20, 5, 0,
+               NPC_S_KPU11_TU_ETHER, 0, 0,
+               NPC_LID_LB, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
-};
-
-static struct npc_kpu_profile_action kpu5_action_entries[] = {
-       NPC_KPU_NOP_ACTION,
-       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_LC, NPC_EC_IP_TTL_0,
                0, 0, 0, 0, 1,
@@ -10402,14 +12166,6 @@ static struct npc_kpu_profile_action kpu5_action_entries[] = {
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_IP,
-               NPC_F_LC_U_IP_FRAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 12, 0, 2, 0,
                NPC_S_KPU8_TCP, 0, 1,
                NPC_LID_LC, NPC_LT_LC_IP_OPT,
@@ -10480,75 +12236,35 @@ static struct npc_kpu_profile_action kpu5_action_entries[] = {
                NPC_F_LC_L_IP_IN_IP,
                0, 0xf, 0, 2,
        },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 6, 0,
-               NPC_S_KPU12_TU_IP6, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_IP_OPT,
-               NPC_F_LC_L_6TO4,
-               0, 0xf, 0, 2,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 3, 0,
-               NPC_S_KPU9_TU_MPLS_IN_IP, 20, 1,
-               NPC_LID_LC, NPC_LT_LC_IP_OPT,
-               NPC_F_LC_L_MPLS_IN_IP,
-               0, 0xf, 0, 2,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_IP_OPT,
-               NPC_F_LC_U_UNK_PROTO,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_IP_OPT,
-               NPC_F_LC_U_IP_FRAG,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_LC, NPC_EC_IP_VER,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_IP,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_ARP,
-               0,
-               0, 0, 0, 0,
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 6, 0,
+               NPC_S_KPU12_TU_IP6, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
+               NPC_F_LC_L_6TO4,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_RARP,
-               0,
-               0, 0, 0, 0,
+               2, 6, 10, 3, 0,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 20, 1,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
+               NPC_F_LC_L_MPLS_IN_IP,
+               0, 0xf, 0, 2,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_PTP,
-               0,
+               NPC_LID_LC, NPC_LT_LC_IP_OPT,
+               NPC_F_LC_U_UNK_PROTO,
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               NPC_ERRLEV_LC, NPC_EC_IP_VER,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_FCOE,
+               NPC_LID_LC, NPC_LT_LC_IP,
                0,
                0, 0, 0, 0,
        },
@@ -10627,7 +12343,7 @@ static struct npc_kpu_profile_action kpu5_action_entries[] = {
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 0,
-               NPC_S_KPU6_IP6_HOP_DEST, 40, 1,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 40, 1,
                NPC_LID_LC, NPC_LT_LC_IP6_EXT,
                NPC_F_LC_L_EXT_HOP,
                0, 0, 0, 0,
@@ -10635,7 +12351,7 @@ static struct npc_kpu_profile_action kpu5_action_entries[] = {
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 0,
-               NPC_S_KPU6_IP6_HOP_DEST, 40, 1,
+               NPC_S_KPU6_IP6_CPT_HOP_DEST, 40, 1,
                NPC_LID_LC, NPC_LT_LC_IP6_EXT,
                NPC_F_LC_L_EXT_DEST,
                0, 0, 0, 0,
@@ -10643,7 +12359,7 @@ static struct npc_kpu_profile_action kpu5_action_entries[] = {
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 0,
-               NPC_S_KPU6_IP6_ROUT, 40, 1,
+               NPC_S_KPU6_IP6_CPT_ROUT, 40, 1,
                NPC_LID_LC, NPC_LT_LC_IP6_EXT,
                NPC_F_LC_L_EXT_ROUT,
                0, 0, 0, 0,
@@ -10651,7 +12367,7 @@ static struct npc_kpu_profile_action kpu5_action_entries[] = {
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 2, 0, 0, 0,
-               NPC_S_KPU6_IP6_FRAG, 40, 1,
+               NPC_S_KPU6_IP6_CPT_FRAG, 40, 1,
                NPC_LID_LC, NPC_LT_LC_IP6_EXT,
                NPC_F_LC_U_IP6_FRAG,
                0, 0, 0, 0,
@@ -10691,112 +12407,328 @@ static struct npc_kpu_profile_action kpu5_action_entries[] = {
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
-               NPC_F_LC_L_EXT_SHIM6,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6_EXT,
+               NPC_F_LC_L_EXT_SHIM6,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               NPC_F_LC_U_UNK_PROTO,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_LC, NPC_EC_IP6_VER,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 1,
+               NPC_LID_LC, NPC_LT_LC_IP6,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_LC, NPC_EC_UNK,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+};
+
+static struct npc_kpu_profile_action kpu6_action_entries[] = {
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 12, 0, 1, 0,
+               NPC_S_KPU8_TCP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 8, 10, 1, 0,
+               NPC_S_KPU8_UDP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_SCTP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_ICMP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_ICMP6, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU9_ESP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_AH, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_GRE, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 5, 0,
+               NPC_S_KPU12_TU_IP6, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU7_IP6_ROUT, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 2, 0, 0, 0,
+               NPC_S_KPU7_IP6_FRAG, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               1, 0xff, 0, 3,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_IP6,
-               NPC_F_LC_U_UNK_PROTO,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_LC, NPC_EC_IP6_VER,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
-               NPC_LID_LC, NPC_LT_LC_IP6,
+               2, 12, 0, 1, 0,
+               NPC_S_KPU8_TCP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 6, 0,
-               NPC_S_KPU12_TU_IP, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               2, 8, 10, 1, 0,
+               NPC_S_KPU8_UDP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 6, 0,
-               NPC_S_KPU12_TU_IP6, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_SCTP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 16, 20, 5, 0,
-               NPC_S_KPU11_TU_ETHER, 8, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_ICMP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 16, 20, 5, 0,
-               NPC_S_KPU11_TU_ETHER, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_ICMP6, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
-               NPC_ERRLEV_LB, NPC_EC_MPLS_2MANY,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU9_ESP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 6, 0,
-               NPC_S_KPU12_TU_IP, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_AH, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 6, 0,
-               NPC_S_KPU12_TU_IP6, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_GRE, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 16, 20, 5, 0,
-               NPC_S_KPU11_TU_ETHER, 4, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               6, 0, 0, 5, 0,
+               NPC_S_KPU12_TU_IP6, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 16, 20, 5, 0,
-               NPC_S_KPU11_TU_ETHER, 0, 0,
-               NPC_LID_LB, NPC_LT_NA,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
        {
-               NPC_ERRLEV_LC, NPC_EC_UNK,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 2, 0, 0, 0,
+               NPC_S_KPU7_IP6_FRAG, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
-               0, 0, 0, 0,
+               1, 0xff, 0, 3,
        },
-};
-
-static struct npc_kpu_profile_action kpu6_action_entries[] = {
-       NPC_KPU_NOP_ACTION,
-       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
@@ -10807,80 +12739,80 @@ static struct npc_kpu_profile_action kpu6_action_entries[] = {
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               2, 12, 0, 1, 0,
+               NPC_S_KPU8_TCP, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               2, 8, 10, 1, 0,
+               NPC_S_KPU8_UDP, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_SCTP, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_ICMP, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_ICMP6, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               0, 0, 0, 2, 0,
+               NPC_S_KPU9_ESP, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_AH, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU8_GRE, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               6, 0, 0, 5, 0,
+               NPC_S_KPU12_TU_IP6, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 0,
+               2, 6, 10, 2, 0,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                0, 0, 0, 0,
@@ -10984,7 +12916,7 @@ static struct npc_kpu_profile_action kpu6_action_entries[] = {
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 2, 0, 0, 0,
-               NPC_S_KPU7_IP6_FRAG, 8, 0,
+               NPC_S_KPU7_CPT_IP6_FRAG, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                1, 0xff, 0, 3,
@@ -11080,7 +13012,7 @@ static struct npc_kpu_profile_action kpu6_action_entries[] = {
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 2, 0, 0, 0,
-               NPC_S_KPU7_IP6_FRAG, 8, 0,
+               NPC_S_KPU7_CPT_IP6_FRAG, 8, 0,
                NPC_LID_LC, NPC_LT_NA,
                0,
                1, 0xff, 0, 3,
@@ -11291,6 +13223,94 @@ static struct npc_kpu_profile_action kpu7_action_entries[] = {
                0, 0, 0, 0,
        },
        {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 12, 0, 0, 0,
+               NPC_S_KPU8_TCP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 8, 10, 0, 0,
+               NPC_S_KPU8_UDP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU8_SCTP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU8_ICMP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU8_ICMP6, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 1, 0,
+               NPC_S_KPU9_ESP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU8_AH, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 0,
+               NPC_S_KPU8_GRE, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               6, 0, 0, 4, 0,
+               NPC_S_KPU12_TU_IP6, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               2, 6, 10, 1, 0,
+               NPC_S_KPU9_TU_MPLS_IN_IP, 8, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
+               NPC_ERRLEV_RE, NPC_EC_NOERR,
+               0, 0, 0, 0, 1,
+               NPC_S_NA, 0, 0,
+               NPC_LID_LC, NPC_LT_NA,
+               0,
+               0, 0, 0, 0,
+       },
+       {
                NPC_ERRLEV_LC, NPC_EC_UNK,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 0,
@@ -12326,10 +14346,10 @@ static struct npc_kpu_profile_action kpu9_action_entries[] = {
        },
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 0, 1,
-               NPC_S_NA, 0, 1,
+               8, 0, 6, 2, 0,
+               NPC_S_KPU12_TU_IP, 8, 1,
                NPC_LID_LE, NPC_LT_LE_GTPU,
-               NPC_F_LE_L_GTPU_UNK,
+               0,
                0, 0, 0, 0,
        },
        {
@@ -13297,7 +15317,7 @@ static struct npc_kpu_profile_action kpu16_action_entries[] = {
        },
 };
 
-static const struct npc_kpu_profile npc_kpu_profiles[] = {
+static struct npc_kpu_profile npc_kpu_profiles[] = {
        {
                ARRAY_SIZE(kpu1_cam_entries),
                ARRAY_SIZE(kpu1_action_entries),
@@ -13396,12 +15416,22 @@ static const struct npc_kpu_profile npc_kpu_profiles[] = {
        },
 };
 
-static const struct npc_lt_def_cfg npc_lt_defaults = {
+static struct npc_lt_def_cfg npc_lt_defaults = {
        .rx_ol2 = {
                .lid = NPC_LID_LA,
                .ltype_match = NPC_LT_LA_ETHER,
                .ltype_mask = 0x0F,
        },
+       .ovlan = {
+               .lid = NPC_LID_LB,
+               .ltype_match = NPC_LT_LB_CTAG,
+               .ltype_mask = 0x0F,
+       },
+       .ivlan = {
+               .lid = NPC_LID_LB,
+               .ltype_match = NPC_LT_LB_STAG_QINQ,
+               .ltype_mask = 0x0F,
+       },
        .rx_oip4 = {
                .lid = NPC_LID_LC,
                .ltype_match = NPC_LT_LC_IP,
@@ -13511,7 +15541,7 @@ static struct npc_mcam_kex npc_mkex_default = {
        .name = "default",
        .kpu_version = NPC_KPU_PROFILE_VER,
        .keyx_cfg = {
-               /* nibble: LA..LE (ltype only) + channel */
+               /* nibble: LA..LE (ltype only) + Error code + Channel */
                [NIX_INTF_RX] = ((u64)NPC_MCAM_KEY_X2 << 32) | NPC_PARSE_NIBBLE_INTF_RX,
                /* nibble: LA..LE (ltype only) */
                [NIX_INTF_TX] = ((u64)NPC_MCAM_KEY_X2 << 32) | NPC_PARSE_NIBBLE_INTF_TX,
@@ -13522,30 +15552,40 @@ static struct npc_mcam_kex npc_mkex_default = {
                [NPC_LID_LA] = {
                        /* Layer A: Ethernet: */
                        [NPC_LT_LA_ETHER] = {
-                               /* DMAC: 6 bytes, KW1[47:0] */
+                               /* DMAC: 6 bytes, KW1[55:8] */
                                KEX_LD_CFG(0x05, 0x0, 0x1, 0x0, NPC_KEXOF_DMAC),
-                               /* Ethertype: 2 bytes, KW0[47:32] */
-                               KEX_LD_CFG(0x01, 0xc, 0x1, 0x0, 0x4),
+                               /* Ethertype: 2 bytes, KW0[55:40] */
+                               KEX_LD_CFG(0x01, 0xc, 0x1, 0x0, 0x5),
+                       },
+                       /* Layer A: HiGig2: */
+                       [NPC_LT_LA_HIGIG2_ETHER] = {
+                               /* Classification: 2 bytes, KW1[23:8] */
+                               KEX_LD_CFG(0x01, 0x8, 0x1, 0x0, NPC_KEXOF_DMAC),
+                               /* VID: 2 bytes, KW1[39:24] */
+                               KEX_LD_CFG(0x01, 0xc, 0x1, 0x0,
+                                          NPC_KEXOF_DMAC + 2),
                        },
                },
                [NPC_LID_LB] = {
                        /* Layer B: Single VLAN (CTAG) */
-                       /* CTAG VLAN[2..3] + Ethertype, 4 bytes, KW0[63:32] */
                        [NPC_LT_LB_CTAG] = {
-                               KEX_LD_CFG(0x03, 0x2, 0x1, 0x0, 0x4),
+                               /* CTAG VLAN: 2 bytes, KW1[7:0], KW0[63:56] */
+                               KEX_LD_CFG(0x01, 0x2, 0x1, 0x0, 0x7),
+                               /* Ethertype: 2 bytes, KW0[55:40] */
+                               KEX_LD_CFG(0x01, 0x4, 0x1, 0x0, 0x5),
                        },
                        /* Layer B: Stacked VLAN (STAG|QinQ) */
                        [NPC_LT_LB_STAG_QINQ] = {
-                               /* Outer VLAN: 2 bytes, KW0[63:48] */
-                               KEX_LD_CFG(0x01, 0x2, 0x1, 0x0, 0x6),
-                               /* Ethertype: 2 bytes, KW0[47:32] */
-                               KEX_LD_CFG(0x01, 0x8, 0x1, 0x0, 0x4),
+                               /* Outer VLAN: 2 bytes, KW1[7:0], KW0[63:56] */
+                               KEX_LD_CFG(0x01, 0x2, 0x1, 0x0, 0x7),
+                               /* Ethertype: 2 bytes, KW0[55:40] */
+                               KEX_LD_CFG(0x01, 0x8, 0x1, 0x0, 0x5),
                        },
                        [NPC_LT_LB_FDSA] = {
-                               /* SWITCH PORT: 1 byte, KW0[63:48] */
-                               KEX_LD_CFG(0x0, 0x1, 0x1, 0x0, 0x6),
-                               /* Ethertype: 2 bytes, KW0[47:32] */
-                               KEX_LD_CFG(0x01, 0x4, 0x1, 0x0, 0x4),
+                               /* SWITCH PORT: 1 byte, KW0[63:56] */
+                               KEX_LD_CFG(0x0, 0x1, 0x1, 0x0, 0x7),
+                               /* Ethertype: 2 bytes, KW0[55:40] */
+                               KEX_LD_CFG(0x01, 0x4, 0x1, 0x0, 0x5),
                        },
                },
                [NPC_LID_LC] = {
@@ -13589,6 +15629,13 @@ static struct npc_mcam_kex npc_mkex_default = {
                                /* DMAC: 6 bytes, KW1[63:16] */
                                KEX_LD_CFG(0x05, 0x8, 0x1, 0x0, 0xa),
                        },
+                       /* Layer A: HiGig2: */
+                       [NPC_LT_LA_IH_NIX_HIGIG2_ETHER] = {
+                               /* PF_FUNC: 2B , KW0 [47:32] */
+                               KEX_LD_CFG(0x01, 0x0, 0x1, 0x0, 0x4),
+                               /* VID: 2 bytes, KW1[31:16] */
+                               KEX_LD_CFG(0x01, 0x10, 0x1, 0x0, 0xa),
+                       },
                },
                [NPC_LID_LB] = {
                        /* Layer B: Single VLAN (CTAG) */