net/ngbe: fix debug logs
[dpdk.git] / app / test-pmd / cmdline_flow.c
index 7b56b1b..c0644d6 100644 (file)
@@ -272,6 +272,10 @@ enum index {
        ITEM_META_DATA,
        ITEM_GRE_KEY,
        ITEM_GRE_KEY_VALUE,
+       ITEM_GRE_OPTION,
+       ITEM_GRE_OPTION_CHECKSUM,
+       ITEM_GRE_OPTION_KEY,
+       ITEM_GRE_OPTION_SEQUENCE,
        ITEM_GTP_PSC,
        ITEM_GTP_PSC_QFI,
        ITEM_GTP_PSC_PDU_T,
@@ -323,13 +327,30 @@ enum index {
        ITEM_FLEX_ITEM_HANDLE,
        ITEM_FLEX_PATTERN_HANDLE,
        ITEM_L2TPV2,
-       ITEM_L2TPV2_COMMON,
-       ITEM_L2TPV2_COMMON_TYPE,
-       ITEM_L2TPV2_COMMON_TYPE_DATA_L,
-       ITEM_L2TPV2_COMMON_TYPE_CTRL,
+       ITEM_L2TPV2_TYPE,
+       ITEM_L2TPV2_TYPE_DATA,
+       ITEM_L2TPV2_TYPE_DATA_L,
+       ITEM_L2TPV2_TYPE_DATA_S,
+       ITEM_L2TPV2_TYPE_DATA_O,
+       ITEM_L2TPV2_TYPE_DATA_L_S,
+       ITEM_L2TPV2_TYPE_CTRL,
+       ITEM_L2TPV2_MSG_DATA_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_SESSION_ID,
        ITEM_L2TPV2_MSG_DATA_L_LENGTH,
        ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
        ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_S_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_S_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_S_NS,
+       ITEM_L2TPV2_MSG_DATA_S_NR,
+       ITEM_L2TPV2_MSG_DATA_O_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_O_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_O_OFFSET,
+       ITEM_L2TPV2_MSG_DATA_L_S_LENGTH,
+       ITEM_L2TPV2_MSG_DATA_L_S_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_L_S_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_L_S_NS,
+       ITEM_L2TPV2_MSG_DATA_L_S_NR,
        ITEM_L2TPV2_MSG_CTRL_LENGTH,
        ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID,
        ITEM_L2TPV2_MSG_CTRL_SESSION_ID,
@@ -1043,6 +1064,7 @@ static const enum index next_item[] = {
        ITEM_ICMP6_ND_OPT_TLA_ETH,
        ITEM_META,
        ITEM_GRE_KEY,
+       ITEM_GRE_OPTION,
        ITEM_GTP_PSC,
        ITEM_PPPOES,
        ITEM_PPPOED,
@@ -1234,6 +1256,14 @@ static const enum index item_gre_key[] = {
        ZERO,
 };
 
+static const enum index item_gre_option[] = {
+       ITEM_GRE_OPTION_CHECKSUM,
+       ITEM_GRE_OPTION_KEY,
+       ITEM_GRE_OPTION_SEQUENCE,
+       ITEM_NEXT,
+       ZERO,
+};
+
 static const enum index item_gtp[] = {
        ITEM_GTP_FLAGS,
        ITEM_GTP_MSG_TYPE,
@@ -1451,19 +1481,70 @@ static const enum index item_flex[] = {
 };
 
 static const enum index item_l2tpv2[] = {
-       ITEM_L2TPV2_COMMON,
+       ITEM_L2TPV2_TYPE,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type[] = {
+       ITEM_L2TPV2_TYPE_DATA,
+       ITEM_L2TPV2_TYPE_DATA_L,
+       ITEM_L2TPV2_TYPE_DATA_S,
+       ITEM_L2TPV2_TYPE_DATA_O,
+       ITEM_L2TPV2_TYPE_DATA_L_S,
+       ITEM_L2TPV2_TYPE_CTRL,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type_data[] = {
+       ITEM_L2TPV2_MSG_DATA_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_SESSION_ID,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type_data_l[] = {
+       ITEM_L2TPV2_MSG_DATA_L_LENGTH,
+       ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type_data_s[] = {
+       ITEM_L2TPV2_MSG_DATA_S_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_S_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_S_NS,
+       ITEM_L2TPV2_MSG_DATA_S_NR,
        ITEM_NEXT,
        ZERO,
 };
 
-static const enum index item_l2tpv2_common[] = {
-       ITEM_L2TPV2_COMMON_TYPE,
+static const enum index item_l2tpv2_type_data_o[] = {
+       ITEM_L2TPV2_MSG_DATA_O_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_O_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_O_OFFSET,
+       ITEM_NEXT,
        ZERO,
 };
 
-static const enum index item_l2tpv2_common_type[] = {
-       ITEM_L2TPV2_COMMON_TYPE_DATA_L,
-       ITEM_L2TPV2_COMMON_TYPE_CTRL,
+static const enum index item_l2tpv2_type_data_l_s[] = {
+       ITEM_L2TPV2_MSG_DATA_L_S_LENGTH,
+       ITEM_L2TPV2_MSG_DATA_L_S_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_L_S_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_L_S_NS,
+       ITEM_L2TPV2_MSG_DATA_L_S_NR,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type_ctrl[] = {
+       ITEM_L2TPV2_MSG_CTRL_LENGTH,
+       ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_CTRL_SESSION_ID,
+       ITEM_L2TPV2_MSG_CTRL_NS,
+       ITEM_L2TPV2_MSG_CTRL_NR,
+       ITEM_NEXT,
        ZERO,
 };
 
@@ -3494,6 +3575,38 @@ static const struct token token_list[] = {
                             item_param),
                .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
        },
+       [ITEM_GRE_OPTION] = {
+               .name = "gre_option",
+               .help = "match GRE optional fields",
+               .priv = PRIV_ITEM(GRE_OPTION,
+                                 sizeof(struct rte_flow_item_gre_opt)),
+               .next = NEXT(item_gre_option),
+               .call = parse_vc,
+       },
+       [ITEM_GRE_OPTION_CHECKSUM] = {
+               .name = "checksum",
+               .help = "match GRE checksum",
+               .next = NEXT(item_gre_option, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre_opt,
+                                            checksum_rsvd.checksum)),
+       },
+       [ITEM_GRE_OPTION_KEY] = {
+               .name = "key",
+               .help = "match GRE key",
+               .next = NEXT(item_gre_option, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre_opt,
+                                            key.key)),
+       },
+       [ITEM_GRE_OPTION_SEQUENCE] = {
+               .name = "sequence",
+               .help = "match GRE sequence",
+               .next = NEXT(item_gre_option, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre_opt,
+                                            sequence.sequence)),
+       },
        [ITEM_GTP_PSC] = {
                .name = "gtp_psc",
                .help = "match GTP extension header with type 0x85",
@@ -3858,31 +3971,46 @@ static const struct token token_list[] = {
                .next = NEXT(item_l2tpv2),
                .call = parse_vc,
        },
-       [ITEM_L2TPV2_COMMON] = {
-               .name = "common",
-               .help = "L2TPv2 common header",
-               .next = NEXT(item_l2tpv2_common),
-       },
-       [ITEM_L2TPV2_COMMON_TYPE] = {
+       [ITEM_L2TPV2_TYPE] = {
                .name = "type",
-               .help = "type of common header",
-               .next = NEXT(item_l2tpv2_common_type),
+               .help = "type of l2tpv2",
+               .next = NEXT(item_l2tpv2_type),
                .args = ARGS(ARG_ENTRY_HTON(struct rte_flow_item_l2tpv2)),
        },
-       [ITEM_L2TPV2_COMMON_TYPE_DATA_L] = {
+       [ITEM_L2TPV2_TYPE_DATA] = {
+               .name = "data",
+               .help = "Type #7: data message without any options",
+               .next = NEXT(item_l2tpv2_type_data),
+               .call = parse_vc_item_l2tpv2_type,
+       },
+       [ITEM_L2TPV2_MSG_DATA_TUNNEL_ID] = {
+               .name = "tunnel_id",
+               .help = "tunnel identifier",
+               .next = NEXT(item_l2tpv2_type_data,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type7.tunnel_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_SESSION_ID] = {
+               .name = "session_id",
+               .help = "session identifier",
+               .next = NEXT(item_l2tpv2_type_data,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type7.session_id)),
+       },
+       [ITEM_L2TPV2_TYPE_DATA_L] = {
                .name = "data_l",
                .help = "Type #6: data message with length option",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_LENGTH,
-                                       ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
-                                       ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
-                                       ITEM_NEXT)),
+               .next = NEXT(item_l2tpv2_type_data_l),
                .call = parse_vc_item_l2tpv2_type,
        },
        [ITEM_L2TPV2_MSG_DATA_L_LENGTH] = {
                .name = "length",
                .help = "message length",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_LENGTH,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_data_l,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3891,8 +4019,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID] = {
                .name = "tunnel_id",
                .help = "tunnel identifier",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_data_l,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3901,29 +4028,150 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_DATA_L_SESSION_ID] = {
                .name = "session_id",
                .help = "session identifier",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_data_l,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
                                             hdr.type6.session_id)),
        },
-       [ITEM_L2TPV2_COMMON_TYPE_CTRL] = {
+       [ITEM_L2TPV2_TYPE_DATA_S] = {
+               .name = "data_s",
+               .help = "Type #5: data message with ns, nr option",
+               .next = NEXT(item_l2tpv2_type_data_s),
+               .call = parse_vc_item_l2tpv2_type,
+       },
+       [ITEM_L2TPV2_MSG_DATA_S_TUNNEL_ID] = {
+               .name = "tunnel_id",
+               .help = "tunnel identifier",
+               .next = NEXT(item_l2tpv2_type_data_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.tunnel_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_S_SESSION_ID] = {
+               .name = "session_id",
+               .help = "session identifier",
+               .next = NEXT(item_l2tpv2_type_data_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.session_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_S_NS] = {
+               .name = "ns",
+               .help = "sequence number for message",
+               .next = NEXT(item_l2tpv2_type_data_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.ns)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_S_NR] = {
+               .name = "nr",
+               .help = "sequence number for next receive message",
+               .next = NEXT(item_l2tpv2_type_data_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.nr)),
+       },
+       [ITEM_L2TPV2_TYPE_DATA_O] = {
+               .name = "data_o",
+               .help = "Type #4: data message with offset option",
+               .next = NEXT(item_l2tpv2_type_data_o),
+               .call = parse_vc_item_l2tpv2_type,
+       },
+       [ITEM_L2TPV2_MSG_DATA_O_TUNNEL_ID] = {
+               .name = "tunnel_id",
+               .help = "tunnel identifier",
+               .next = NEXT(item_l2tpv2_type_data_o,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type4.tunnel_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_O_SESSION_ID] = {
+               .name = "session_id",
+               .help = "session identifier",
+               .next = NEXT(item_l2tpv2_type_data_o,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.session_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_O_OFFSET] = {
+               .name = "offset_size",
+               .help = "the size of offset padding",
+               .next = NEXT(item_l2tpv2_type_data_o,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type4.offset_size)),
+       },
+       [ITEM_L2TPV2_TYPE_DATA_L_S] = {
+               .name = "data_l_s",
+               .help = "Type #3: data message contains length, ns, nr "
+                       "options",
+               .next = NEXT(item_l2tpv2_type_data_l_s),
+               .call = parse_vc_item_l2tpv2_type,
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_LENGTH] = {
+               .name = "length",
+               .help = "message length",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.length)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_TUNNEL_ID] = {
+               .name = "tunnel_id",
+               .help = "tunnel identifier",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.tunnel_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_SESSION_ID] = {
+               .name = "session_id",
+               .help = "session identifier",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.session_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_NS] = {
+               .name = "ns",
+               .help = "sequence number for message",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.ns)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_NR] = {
+               .name = "nr",
+               .help = "sequence number for next receive message",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.nr)),
+       },
+       [ITEM_L2TPV2_TYPE_CTRL] = {
                .name = "control",
-               .help = "Type #3: conrtol message contains length, ns, nr options",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_LENGTH,
-                                       ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID,
-                                       ITEM_L2TPV2_MSG_CTRL_SESSION_ID,
-                                       ITEM_L2TPV2_MSG_CTRL_NS,
-                                       ITEM_L2TPV2_MSG_CTRL_NR,
-                                       ITEM_NEXT)),
+               .help = "Type #3: conrtol message contains length, ns, nr "
+                       "options",
+               .next = NEXT(item_l2tpv2_type_ctrl),
                .call = parse_vc_item_l2tpv2_type,
        },
        [ITEM_L2TPV2_MSG_CTRL_LENGTH] = {
                .name = "length",
                .help = "message length",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_LENGTH,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3932,8 +4180,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID] = {
                .name = "tunnel_id",
                .help = "tunnel identifier",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3942,8 +4189,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_CTRL_SESSION_ID] = {
                .name = "session_id",
                .help = "session identifier",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_SESSION_ID,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3952,8 +4198,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_CTRL_NS] = {
                .name = "ns",
                .help = "sequence number for message",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_NS,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3962,8 +4207,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_CTRL_NR] = {
                .name = "nr",
                .help = "sequence number for next receive message",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_NS,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -5904,11 +6148,23 @@ parse_vc_item_l2tpv2_type(struct context *ctx, const struct token *token,
        if (parse_default(ctx, token, str, len, NULL, 0) < 0)
                return -1;
        switch (ctx->curr) {
-       case ITEM_L2TPV2_COMMON_TYPE_DATA_L:
-               msg_type |= 0x4000;
+       case ITEM_L2TPV2_TYPE_DATA:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA;
+               break;
+       case ITEM_L2TPV2_TYPE_DATA_L:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA_L;
+               break;
+       case ITEM_L2TPV2_TYPE_DATA_S:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA_S;
+               break;
+       case ITEM_L2TPV2_TYPE_DATA_O:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA_O;
+               break;
+       case ITEM_L2TPV2_TYPE_DATA_L_S:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA_L_S;
                break;
-       case ITEM_L2TPV2_COMMON_TYPE_CTRL:
-               msg_type |= 0xC800;
+       case ITEM_L2TPV2_TYPE_CTRL:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_CONTROL;
                break;
        default:
                return -1;
@@ -9252,6 +9508,33 @@ cmd_set_raw_parsed(const struct buffer *in)
                                ((const struct rte_flow_item_flex *)
                                item->spec)->length : 0;
                        break;
+               case RTE_FLOW_ITEM_TYPE_GRE_OPTION:
+                       size = 0;
+                       if (item->spec) {
+                               const struct rte_flow_item_gre_opt
+                                       *opt = item->spec;
+                               if (opt->checksum_rsvd.checksum) {
+                                       *total_size +=
+                                               sizeof(opt->checksum_rsvd);
+                                       rte_memcpy(data_tail - (*total_size),
+                                                  &opt->checksum_rsvd,
+                                                  sizeof(opt->checksum_rsvd));
+                               }
+                               if (opt->key.key) {
+                                       *total_size += sizeof(opt->key.key);
+                                       rte_memcpy(data_tail - (*total_size),
+                                                  &opt->key.key,
+                                                  sizeof(opt->key.key));
+                               }
+                               if (opt->sequence.sequence) {
+                                       *total_size += sizeof(opt->sequence.sequence);
+                                       rte_memcpy(data_tail - (*total_size),
+                                                  &opt->sequence.sequence,
+                                                  sizeof(opt->sequence.sequence));
+                               }
+                       }
+                       proto = 0x2F;
+                       break;
                default:
                        fprintf(stderr, "Error - Not supported item\n");
                        goto error;