net/bnxt: remove VLAN pop action for egress flows

[dpdk.git] / drivers / net / bnxt / tf_ulp / ulp_template_db_act.c

diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
index 14ce16e..de96afe 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
@@ -37,63 +37,60 @@ uint16_t ulp_act_sig_tbl[BNXT_ULP_ACT_SIG_TBL_MAX_SZ] = {
        [BNXT_ULP_ACT_HID_0901] = 26,
        [BNXT_ULP_ACT_HID_0121] = 27,
        [BNXT_ULP_ACT_HID_0004] = 28,
-       [BNXT_ULP_ACT_HID_0804] = 29,
-       [BNXT_ULP_ACT_HID_0105] = 30,
-       [BNXT_ULP_ACT_HID_0024] = 31,
-       [BNXT_ULP_ACT_HID_0905] = 32,
-       [BNXT_ULP_ACT_HID_0125] = 33,
-       [BNXT_ULP_ACT_HID_0001] = 34,
-       [BNXT_ULP_ACT_HID_0005] = 35,
-       [BNXT_ULP_ACT_HID_0009] = 36,
-       [BNXT_ULP_ACT_HID_000d] = 37,
-       [BNXT_ULP_ACT_HID_0021] = 38,
-       [BNXT_ULP_ACT_HID_0029] = 39,
-       [BNXT_ULP_ACT_HID_0025] = 40,
-       [BNXT_ULP_ACT_HID_002d] = 41,
-       [BNXT_ULP_ACT_HID_0801] = 42,
-       [BNXT_ULP_ACT_HID_0809] = 43,
-       [BNXT_ULP_ACT_HID_0805] = 44,
-       [BNXT_ULP_ACT_HID_080d] = 45,
-       [BNXT_ULP_ACT_HID_0c15] = 46,
-       [BNXT_ULP_ACT_HID_0c19] = 47,
-       [BNXT_ULP_ACT_HID_02f6] = 48,
-       [BNXT_ULP_ACT_HID_04f8] = 49,
-       [BNXT_ULP_ACT_HID_01df] = 50,
-       [BNXT_ULP_ACT_HID_07e5] = 51,
-       [BNXT_ULP_ACT_HID_06ce] = 52,
-       [BNXT_ULP_ACT_HID_02fa] = 53,
-       [BNXT_ULP_ACT_HID_04fc] = 54,
-       [BNXT_ULP_ACT_HID_01e3] = 55,
-       [BNXT_ULP_ACT_HID_07e9] = 56,
-       [BNXT_ULP_ACT_HID_06d2] = 57,
-       [BNXT_ULP_ACT_HID_03f7] = 58,
-       [BNXT_ULP_ACT_HID_05f9] = 59,
-       [BNXT_ULP_ACT_HID_02e0] = 60,
-       [BNXT_ULP_ACT_HID_08e6] = 61,
-       [BNXT_ULP_ACT_HID_07cf] = 62,
-       [BNXT_ULP_ACT_HID_03fb] = 63,
-       [BNXT_ULP_ACT_HID_05fd] = 64,
-       [BNXT_ULP_ACT_HID_02e4] = 65,
-       [BNXT_ULP_ACT_HID_08ea] = 66,
-       [BNXT_ULP_ACT_HID_07d3] = 67,
-       [BNXT_ULP_ACT_HID_040d] = 68,
-       [BNXT_ULP_ACT_HID_040f] = 69,
-       [BNXT_ULP_ACT_HID_0413] = 70,
-       [BNXT_ULP_ACT_HID_0c0d] = 71,
+       [BNXT_ULP_ACT_HID_0006] = 29,
+       [BNXT_ULP_ACT_HID_0804] = 30,
+       [BNXT_ULP_ACT_HID_0105] = 31,
+       [BNXT_ULP_ACT_HID_0024] = 32,
+       [BNXT_ULP_ACT_HID_0905] = 33,
+       [BNXT_ULP_ACT_HID_0125] = 34,
+       [BNXT_ULP_ACT_HID_0001] = 35,
+       [BNXT_ULP_ACT_HID_0005] = 36,
+       [BNXT_ULP_ACT_HID_0009] = 37,
+       [BNXT_ULP_ACT_HID_000d] = 38,
+       [BNXT_ULP_ACT_HID_0021] = 39,
+       [BNXT_ULP_ACT_HID_0029] = 40,
+       [BNXT_ULP_ACT_HID_0025] = 41,
+       [BNXT_ULP_ACT_HID_002d] = 42,
+       [BNXT_ULP_ACT_HID_0801] = 43,
+       [BNXT_ULP_ACT_HID_0809] = 44,
+       [BNXT_ULP_ACT_HID_0805] = 45,
+       [BNXT_ULP_ACT_HID_080d] = 46,
+       [BNXT_ULP_ACT_HID_0c15] = 47,
+       [BNXT_ULP_ACT_HID_0c19] = 48,
+       [BNXT_ULP_ACT_HID_02f6] = 49,
+       [BNXT_ULP_ACT_HID_04f8] = 50,
+       [BNXT_ULP_ACT_HID_01df] = 51,
+       [BNXT_ULP_ACT_HID_07e5] = 52,
+       [BNXT_ULP_ACT_HID_06ce] = 53,
+       [BNXT_ULP_ACT_HID_02fa] = 54,
+       [BNXT_ULP_ACT_HID_04fc] = 55,
+       [BNXT_ULP_ACT_HID_01e3] = 56,
+       [BNXT_ULP_ACT_HID_07e9] = 57,
+       [BNXT_ULP_ACT_HID_06d2] = 58,
+       [BNXT_ULP_ACT_HID_03f7] = 59,
+       [BNXT_ULP_ACT_HID_05f9] = 60,
+       [BNXT_ULP_ACT_HID_02e0] = 61,
+       [BNXT_ULP_ACT_HID_08e6] = 62,
+       [BNXT_ULP_ACT_HID_07cf] = 63,
+       [BNXT_ULP_ACT_HID_03fb] = 64,
+       [BNXT_ULP_ACT_HID_05fd] = 65,
+       [BNXT_ULP_ACT_HID_02e4] = 66,
+       [BNXT_ULP_ACT_HID_08ea] = 67,
+       [BNXT_ULP_ACT_HID_07d3] = 68,
+       [BNXT_ULP_ACT_HID_040d] = 69,
+       [BNXT_ULP_ACT_HID_040f] = 70,
+       [BNXT_ULP_ACT_HID_0413] = 71,
        [BNXT_ULP_ACT_HID_0567] = 72,
        [BNXT_ULP_ACT_HID_0a49] = 73,
        [BNXT_ULP_ACT_HID_050e] = 74,
-       [BNXT_ULP_ACT_HID_0d0e] = 75,
-       [BNXT_ULP_ACT_HID_0668] = 76,
-       [BNXT_ULP_ACT_HID_0b4a] = 77,
-       [BNXT_ULP_ACT_HID_0411] = 78,
-       [BNXT_ULP_ACT_HID_056b] = 79,
-       [BNXT_ULP_ACT_HID_0a4d] = 80,
-       [BNXT_ULP_ACT_HID_0c11] = 81,
-       [BNXT_ULP_ACT_HID_0512] = 82,
-       [BNXT_ULP_ACT_HID_0d12] = 83,
-       [BNXT_ULP_ACT_HID_066c] = 84,
-       [BNXT_ULP_ACT_HID_0b4e] = 85
+       [BNXT_ULP_ACT_HID_0668] = 75,
+       [BNXT_ULP_ACT_HID_0b4a] = 76,
+       [BNXT_ULP_ACT_HID_0411] = 77,
+       [BNXT_ULP_ACT_HID_056b] = 78,
+       [BNXT_ULP_ACT_HID_0a4d] = 79,
+       [BNXT_ULP_ACT_HID_0512] = 80,
+       [BNXT_ULP_ACT_HID_066c] = 81,
+       [BNXT_ULP_ACT_HID_0b4e] = 82
 };
 
 struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
@@ -339,6 +336,14 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
        .act_tid = 2
        },
        [29] = {
+       .act_hid = BNXT_ULP_ACT_HID_0006,
+       .act_sig = { .bits =
+               BNXT_ULP_ACTION_BIT_COUNT |
+               BNXT_ULP_ACTION_BIT_DROP |
+               BNXT_ULP_FLOW_DIR_BITMASK_ING },
+       .act_tid = 2
+       },
+       [30] = {
        .act_hid = BNXT_ULP_ACT_HID_0804,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -346,7 +351,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 2
        },
-       [30] = {
+       [31] = {
        .act_hid = BNXT_ULP_ACT_HID_0105,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -354,7 +359,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 2
        },
-       [31] = {
+       [32] = {
        .act_hid = BNXT_ULP_ACT_HID_0024,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -362,7 +367,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 2
        },
-       [32] = {
+       [33] = {
        .act_hid = BNXT_ULP_ACT_HID_0905,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -371,7 +376,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 2
        },
-       [33] = {
+       [34] = {
        .act_hid = BNXT_ULP_ACT_HID_0125,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -380,14 +385,14 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 2
        },
-       [34] = {
+       [35] = {
        .act_hid = BNXT_ULP_ACT_HID_0001,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [35] = {
+       [36] = {
        .act_hid = BNXT_ULP_ACT_HID_0005,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -395,7 +400,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [36] = {
+       [37] = {
        .act_hid = BNXT_ULP_ACT_HID_0009,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -403,7 +408,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [37] = {
+       [38] = {
        .act_hid = BNXT_ULP_ACT_HID_000d,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -412,7 +417,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [38] = {
+       [39] = {
        .act_hid = BNXT_ULP_ACT_HID_0021,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -420,7 +425,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [39] = {
+       [40] = {
        .act_hid = BNXT_ULP_ACT_HID_0029,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -429,7 +434,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [40] = {
+       [41] = {
        .act_hid = BNXT_ULP_ACT_HID_0025,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -438,7 +443,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [41] = {
+       [42] = {
        .act_hid = BNXT_ULP_ACT_HID_002d,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -448,7 +453,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [42] = {
+       [43] = {
        .act_hid = BNXT_ULP_ACT_HID_0801,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -456,7 +461,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [43] = {
+       [44] = {
        .act_hid = BNXT_ULP_ACT_HID_0809,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -465,7 +470,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [44] = {
+       [45] = {
        .act_hid = BNXT_ULP_ACT_HID_0805,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -474,7 +479,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [45] = {
+       [46] = {
        .act_hid = BNXT_ULP_ACT_HID_080d,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_MARK |
@@ -484,14 +489,14 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_ING },
        .act_tid = 3
        },
-       [46] = {
+       [47] = {
        .act_hid = BNXT_ULP_ACT_HID_0c15,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_VXLAN_ENCAP |
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 4
        },
-       [47] = {
+       [48] = {
        .act_hid = BNXT_ULP_ACT_HID_0c19,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_VXLAN_ENCAP |
@@ -499,14 +504,14 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 4
        },
-       [48] = {
+       [49] = {
        .act_hid = BNXT_ULP_ACT_HID_02f6,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_SET_IPV4_SRC |
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [49] = {
+       [50] = {
        .act_hid = BNXT_ULP_ACT_HID_04f8,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_SET_IPV4_SRC |
@@ -514,14 +519,14 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [50] = {
+       [51] = {
        .act_hid = BNXT_ULP_ACT_HID_01df,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_SET_IPV4_DST |
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [51] = {
+       [52] = {
        .act_hid = BNXT_ULP_ACT_HID_07e5,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_SET_IPV4_DST |
@@ -530,7 +535,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [52] = {
+       [53] = {
        .act_hid = BNXT_ULP_ACT_HID_06ce,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_SET_IPV4_SRC |
@@ -540,7 +545,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [53] = {
+       [54] = {
        .act_hid = BNXT_ULP_ACT_HID_02fa,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -548,7 +553,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [54] = {
+       [55] = {
        .act_hid = BNXT_ULP_ACT_HID_04fc,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -557,7 +562,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [55] = {
+       [56] = {
        .act_hid = BNXT_ULP_ACT_HID_01e3,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -565,7 +570,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [56] = {
+       [57] = {
        .act_hid = BNXT_ULP_ACT_HID_07e9,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -575,7 +580,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [57] = {
+       [58] = {
        .act_hid = BNXT_ULP_ACT_HID_06d2,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -586,7 +591,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [58] = {
+       [59] = {
        .act_hid = BNXT_ULP_ACT_HID_03f7,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -594,7 +599,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [59] = {
+       [60] = {
        .act_hid = BNXT_ULP_ACT_HID_05f9,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -603,7 +608,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [60] = {
+       [61] = {
        .act_hid = BNXT_ULP_ACT_HID_02e0,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -611,7 +616,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [61] = {
+       [62] = {
        .act_hid = BNXT_ULP_ACT_HID_08e6,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -621,7 +626,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [62] = {
+       [63] = {
        .act_hid = BNXT_ULP_ACT_HID_07cf,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -632,7 +637,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [63] = {
+       [64] = {
        .act_hid = BNXT_ULP_ACT_HID_03fb,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -641,7 +646,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [64] = {
+       [65] = {
        .act_hid = BNXT_ULP_ACT_HID_05fd,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -651,7 +656,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [65] = {
+       [66] = {
        .act_hid = BNXT_ULP_ACT_HID_02e4,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -660,7 +665,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [66] = {
+       [67] = {
        .act_hid = BNXT_ULP_ACT_HID_08ea,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -671,7 +676,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [67] = {
+       [68] = {
        .act_hid = BNXT_ULP_ACT_HID_07d3,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -683,20 +688,20 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 5
        },
-       [68] = {
+       [69] = {
        .act_hid = BNXT_ULP_ACT_HID_040d,
        .act_sig = { .bits =
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [69] = {
+       [70] = {
        .act_hid = BNXT_ULP_ACT_HID_040f,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DROP |
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [70] = {
+       [71] = {
        .act_hid = BNXT_ULP_ACT_HID_0413,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DROP |
@@ -704,13 +709,6 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [71] = {
-       .act_hid = BNXT_ULP_ACT_HID_0c0d,
-       .act_sig = { .bits =
-               BNXT_ULP_ACTION_BIT_POP_VLAN |
-               BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-       .act_tid = 6
-       },
        [72] = {
        .act_hid = BNXT_ULP_ACT_HID_0567,
        .act_sig = { .bits =
@@ -736,14 +734,6 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
        .act_tid = 6
        },
        [75] = {
-       .act_hid = BNXT_ULP_ACT_HID_0d0e,
-       .act_sig = { .bits =
-               BNXT_ULP_ACTION_BIT_DEC_TTL |
-               BNXT_ULP_ACTION_BIT_POP_VLAN |
-               BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-       .act_tid = 6
-       },
-       [76] = {
        .act_hid = BNXT_ULP_ACT_HID_0668,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -753,7 +743,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [77] = {
+       [76] = {
        .act_hid = BNXT_ULP_ACT_HID_0b4a,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_DEC_TTL |
@@ -762,14 +752,14 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [78] = {
+       [77] = {
        .act_hid = BNXT_ULP_ACT_HID_0411,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [79] = {
+       [78] = {
        .act_hid = BNXT_ULP_ACT_HID_056b,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -779,7 +769,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [80] = {
+       [79] = {
        .act_hid = BNXT_ULP_ACT_HID_0a4d,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -788,15 +778,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [81] = {
-       .act_hid = BNXT_ULP_ACT_HID_0c11,
-       .act_sig = { .bits =
-               BNXT_ULP_ACTION_BIT_COUNT |
-               BNXT_ULP_ACTION_BIT_POP_VLAN |
-               BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-       .act_tid = 6
-       },
-       [82] = {
+       [80] = {
        .act_hid = BNXT_ULP_ACT_HID_0512,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -804,16 +786,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [83] = {
-       .act_hid = BNXT_ULP_ACT_HID_0d12,
-       .act_sig = { .bits =
-               BNXT_ULP_ACTION_BIT_COUNT |
-               BNXT_ULP_ACTION_BIT_DEC_TTL |
-               BNXT_ULP_ACTION_BIT_POP_VLAN |
-               BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-       .act_tid = 6
-       },
-       [84] = {
+       [81] = {
        .act_hid = BNXT_ULP_ACT_HID_066c,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -824,7 +797,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
                BNXT_ULP_FLOW_DIR_BITMASK_EGR },
        .act_tid = 6
        },
-       [85] = {
+       [82] = {
        .act_hid = BNXT_ULP_ACT_HID_0b4e,
        .act_sig = { .bits =
                BNXT_ULP_ACTION_BIT_COUNT |
@@ -2592,17 +2565,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {
        },
        {
        .field_bit_size = 1,
-       .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT,
-       .result_operand = {
-               ((uint64_t)BNXT_ULP_ACTION_BIT_POP_VLAN >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_ACTION_BIT_POP_VLAN >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_ACTION_BIT_POP_VLAN >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_ACTION_BIT_POP_VLAN >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_ACTION_BIT_POP_VLAN >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_ACTION_BIT_POP_VLAN >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_ACTION_BIT_POP_VLAN >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_ACTION_BIT_POP_VLAN & 0xff,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+       .result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO
        },
        {
        .field_bit_size = 1,