app/testpmd: fix build without i40e
[dpdk.git] / app / test-pmd / cmdline.c
index 27b7086..0d2d6aa 100644 (file)
@@ -650,20 +650,6 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set link-down port (port_id)\n"
                        "       Set link down for a port.\n\n"
 
-                       "E-tag set insertion on port-tag-id (value)"
-                       " port (port_id) vf (vf_id)\n"
-                       "    Enable E-tag insertion for a VF on a port\n\n"
-
-                       "E-tag set insertion off port (port_id) vf (vf_id)\n"
-                       "    Disable E-tag insertion for a VF on a port\n\n"
-
-                       "E-tag set stripping (on|off) port (port_id)\n"
-                       "    Enable/disable E-tag stripping on a port\n\n"
-
-                       "E-tag set forwarding (on|off) port (port_id)\n"
-                       "    Enable/disable E-tag based forwarding"
-                       " on a port\n\n"
-
                        "ddp add (port_id) (profile_path[,backup_profile_path])\n"
                        "    Load a profile package on a port\n\n"
 
@@ -802,7 +788,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "receive buffers available.\n\n"
 
                        "port config all rss (all|default|ip|tcp|udp|sctp|"
-                       "ether|port|vxlan|geneve|nvgre|vxlan-gpe|none|level-default|"
+                       "ether|port|vxlan|geneve|nvgre|vxlan-gpe|ecpri|none|level-default|"
                        "level-outer|level-inner|<flowtype_id>)\n"
                        "    Set the RSS mode.\n\n"
 
@@ -843,14 +829,6 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port (port_id) (rxq|txq) (queue_id) setup\n"
                        "    Setup a rx/tx queue of port X.\n\n"
 
-                       "port config (port_id|all) l2-tunnel E-tag ether-type"
-                       " (value)\n"
-                       "    Set the value of E-tag ether-type.\n\n"
-
-                       "port config (port_id|all) l2-tunnel E-tag"
-                       " (enable|disable)\n"
-                       "    Enable/disable the E-tag support.\n\n"
-
                        "port config (port_id) pctype mapping reset\n"
                        "    Reset flow type to pctype mapping on a port\n\n"
 
@@ -959,62 +937,12 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "filters:\n"
                        "--------\n\n"
 
-                       "flow_director_filter (port_id) mode IP (add|del|update)"
-                       " flow (ipv4-other|ipv4-frag|ipv6-other|ipv6-frag)"
-                       " src (src_ip_address) dst (dst_ip_address)"
-                       " tos (tos_value) proto (proto_value) ttl (ttl_value)"
-                       " vlan (vlan_value) flexbytes (flexbytes_value)"
-                       " (drop|fwd) pf|vf(vf_id) queue (queue_id)"
-                       " fd_id (fd_id_value)\n"
-                       "    Add/Del an IP type flow director filter.\n\n"
-
-                       "flow_director_filter (port_id) mode IP (add|del|update)"
-                       " flow (ipv4-tcp|ipv4-udp|ipv6-tcp|ipv6-udp)"
-                       " src (src_ip_address) (src_port)"
-                       " dst (dst_ip_address) (dst_port)"
-                       " tos (tos_value) ttl (ttl_value)"
-                       " vlan (vlan_value) flexbytes (flexbytes_value)"
-                       " (drop|fwd) pf|vf(vf_id) queue (queue_id)"
-                       " fd_id (fd_id_value)\n"
-                       "    Add/Del an UDP/TCP type flow director filter.\n\n"
-
-                       "flow_director_filter (port_id) mode IP (add|del|update)"
-                       " flow (ipv4-sctp|ipv6-sctp)"
-                       " src (src_ip_address) (src_port)"
-                       " dst (dst_ip_address) (dst_port)"
-                       " tag (verification_tag) "
-                       " tos (tos_value) ttl (ttl_value)"
-                       " vlan (vlan_value)"
-                       " flexbytes (flexbytes_value) (drop|fwd)"
-                       " pf|vf(vf_id) queue (queue_id) fd_id (fd_id_value)\n"
-                       "    Add/Del a SCTP type flow director filter.\n\n"
-
-                       "flow_director_filter (port_id) mode IP (add|del|update)"
-                       " flow l2_payload ether (ethertype)"
-                       " flexbytes (flexbytes_value) (drop|fwd)"
-                       " pf|vf(vf_id) queue (queue_id) fd_id (fd_id_value)\n"
-                       "    Add/Del a l2 payload type flow director filter.\n\n"
-
-                       "flow_director_filter (port_id) mode MAC-VLAN (add|del|update)"
-                       " mac (mac_address) vlan (vlan_value)"
-                       " flexbytes (flexbytes_value) (drop|fwd)"
-                       " queue (queue_id) fd_id (fd_id_value)\n"
-                       "    Add/Del a MAC-VLAN flow director filter.\n\n"
-
-                       "flow_director_filter (port_id) mode Tunnel (add|del|update)"
-                       " mac (mac_address) vlan (vlan_value)"
-                       " tunnel (NVGRE|VxLAN) tunnel-id (tunnel_id_value)"
-                       " flexbytes (flexbytes_value) (drop|fwd)"
-                       " queue (queue_id) fd_id (fd_id_value)\n"
-                       "    Add/Del a Tunnel flow director filter.\n\n"
-
+#ifdef RTE_NET_I40E
                        "flow_director_filter (port_id) mode raw (add|del|update)"
                        " flow (flow_id) (drop|fwd) queue (queue_id)"
                        " fd_id (fd_id_value) packet (packet file name)\n"
                        "    Add/Del a raw type flow director filter.\n\n"
-
-                       "flush_flow_director (port_id)\n"
-                       "    Flush all flow director entries of a device.\n\n"
+#endif
 
                        "flow_director_mask (port_id) mode IP vlan (vlan_value)"
                        " src_mask (ipv4_src) (ipv6_src) (src_port)"
@@ -1031,27 +959,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        " tunnel-id (tunnel_id_value)\n"
                        "    Set flow director Tunnel mask.\n\n"
 
-                       "flow_director_flex_mask (port_id)"
-                       " flow (none|ipv4-other|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|"
-                       "ipv6-other|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|l2_payload|all)"
-                       " (mask)\n"
-                       "    Configure mask of flex payload.\n\n"
-
                        "flow_director_flex_payload (port_id)"
                        " (raw|l2|l3|l4) (config)\n"
                        "    Configure flex payload selection.\n\n"
 
-                       "set_fdir_input_set (port_id) "
-                       "(ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
-                       "ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
-                       "l2_payload) (ivlan|ethertype|src-ipv4|dst-ipv4|src-ipv6|"
-                       "dst-ipv6|ipv4-tos|ipv4-proto|ipv4-ttl|ipv6-tc|"
-                       "ipv6-next-header|ipv6-hop-limits|udp-src-port|"
-                       "udp-dst-port|tcp-src-port|tcp-dst-port|"
-                       "sctp-src-port|sctp-dst-port|sctp-veri-tag|none)"
-                       " (select|add)\n"
-                       "    Set the input set for FDir.\n\n"
-
                        "flow validate {port_id}"
                        " [group {group_id}] [priority {level}]"
                        " [ingress] [egress]"
@@ -1356,7 +1267,7 @@ cmdline_parse_token_string_t cmd_operate_specific_port_port =
                                                name, "start#stop#close#reset");
 cmdline_parse_token_num_t cmd_operate_specific_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_operate_specific_port_result,
-                                                       value, UINT8);
+                                                       value, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_operate_specific_port = {
        .f = cmd_operate_specific_port_parsed,
@@ -1494,7 +1405,7 @@ cmdline_parse_token_string_t cmd_operate_detach_port_keyword =
                        keyword, "detach");
 cmdline_parse_token_num_t cmd_operate_detach_port_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_operate_detach_port_result,
-                       port_id, UINT16);
+                       port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_operate_detach_port = {
        .f = cmd_operate_detach_port_parsed,
@@ -1718,7 +1629,7 @@ cmdline_parse_token_string_t cmd_config_speed_specific_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, keyword,
                                                                "config");
 cmdline_parse_token_num_t cmd_config_speed_specific_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_speed_specific_item1 =
        TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, item1,
                                                                "speed");
@@ -1790,7 +1701,7 @@ cmdline_parse_token_string_t cmd_config_loopback_all_item =
        TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_all, item,
                                                        "loopback");
 cmdline_parse_token_num_t cmd_config_loopback_all_mode =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_loopback_all = {
        .f = cmd_config_loopback_all_parsed,
@@ -1844,13 +1755,13 @@ cmdline_parse_token_string_t cmd_config_loopback_specific_keyword =
                                                                "config");
 cmdline_parse_token_num_t cmd_config_loopback_specific_id =
        TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, port_id,
-                                                               UINT16);
+                                                               RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_loopback_specific_item =
        TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_specific, item,
                                                                "loopback");
 cmdline_parse_token_num_t cmd_config_loopback_specific_mode =
        TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, mode,
-                             UINT32);
+                             RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_loopback_specific = {
        .f = cmd_config_loopback_specific_parsed,
@@ -1935,7 +1846,7 @@ cmdline_parse_token_string_t cmd_config_rx_tx_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_tx, name,
                                                "rxq#txq#rxd#txd");
 cmdline_parse_token_num_t cmd_config_rx_tx_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_rx_tx = {
        .f = cmd_config_rx_tx_parsed,
@@ -2017,7 +1928,7 @@ cmdline_parse_token_string_t cmd_config_max_pkt_len_name =
                                                                "max-pkt-len");
 cmdline_parse_token_num_t cmd_config_max_pkt_len_value =
        TOKEN_NUM_INITIALIZER(struct cmd_config_max_pkt_len_result, value,
-                                                               UINT32);
+                                                               RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_max_pkt_len = {
        .f = cmd_config_max_pkt_len_parsed,
@@ -2089,7 +2000,7 @@ cmdline_parse_token_string_t cmd_config_max_lro_pkt_size_name =
                                 name, "max-lro-pkt-size");
 cmdline_parse_token_num_t cmd_config_max_lro_pkt_size_value =
        TOKEN_NUM_INITIALIZER(struct cmd_config_max_lro_pkt_size_result,
-                             value, UINT32);
+                             value, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_max_lro_pkt_size = {
        .f = cmd_config_max_lro_pkt_size_parsed,
@@ -2138,9 +2049,11 @@ cmdline_parse_token_string_t cmd_config_mtu_mtu =
        TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword,
                                 "mtu");
 cmdline_parse_token_num_t cmd_config_mtu_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id,
+                                RTE_UINT16);
 cmdline_parse_token_num_t cmd_config_mtu_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value,
+                                RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_mtu = {
        .f = cmd_config_mtu_parsed,
@@ -2251,7 +2164,8 @@ cmd_config_rss_parsed(void *parsed_result,
                rss_conf.rss_hf = ETH_RSS_ETH | ETH_RSS_VLAN | ETH_RSS_IP |
                        ETH_RSS_TCP | ETH_RSS_UDP | ETH_RSS_SCTP |
                        ETH_RSS_L2_PAYLOAD | ETH_RSS_L2TPV3 | ETH_RSS_ESP |
-                       ETH_RSS_AH | ETH_RSS_PFCP | ETH_RSS_GTPU;
+                       ETH_RSS_AH | ETH_RSS_PFCP | ETH_RSS_GTPU |
+                       ETH_RSS_ECPRI;
        else if (!strcmp(res->value, "eth"))
                rss_conf.rss_hf = ETH_RSS_ETH;
        else if (!strcmp(res->value, "vlan"))
@@ -2310,6 +2224,8 @@ cmd_config_rss_parsed(void *parsed_result,
                rss_conf.rss_hf = ETH_RSS_PPPOE;
        else if (!strcmp(res->value, "gtpu"))
                rss_conf.rss_hf = ETH_RSS_GTPU;
+       else if (!strcmp(res->value, "ecpri"))
+               rss_conf.rss_hf = ETH_RSS_ECPRI;
        else if (!strcmp(res->value, "none"))
                rss_conf.rss_hf = 0;
        else if (!strcmp(res->value, "level-default")) {
@@ -2380,7 +2296,7 @@ cmdline_parse_inst_t cmd_config_rss = {
        .data = NULL,
        .help_str = "port config all rss "
                "all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|"
-               "nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|none|level-default|"
+               "nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|none|level-default|"
                "level-outer|level-inner|<flowtype_id>",
        .tokens = {
                (void *)&cmd_config_rss_port,
@@ -2481,7 +2397,8 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_config =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config,
                                 "config");
 cmdline_parse_token_num_t cmd_config_rss_hash_key_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id,
+                                RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key,
                                 rss_hash_key, "rss-hash-key");
@@ -2493,7 +2410,7 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_type =
                                 "ipv6-tcp-ex#ipv6-udp-ex#"
                                 "l3-src-only#l3-dst-only#l4-src-only#l4-dst-only#"
                                 "l2-src-only#l2-dst-only#s-vlan#c-vlan#"
-                                "l2tpv3#esp#ah#pfcp#pppoe#gtpu");
+                                "l2tpv3#esp#ah#pfcp#pppoe#gtpu#ecpri");
 cmdline_parse_token_string_t cmd_config_rss_hash_key_value =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, key, NULL);
 
@@ -2506,7 +2423,7 @@ cmdline_parse_inst_t cmd_config_rss_hash_key = {
                "l2-payload|ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex|"
                "l3-src-only|l3-dst-only|l4-src-only|l4-dst-only|"
                "l2-src-only|l2-dst-only|s-vlan|c-vlan|"
-               "l2tpv3|esp|ah|pfcp|pppoe|gtpu "
+               "l2tpv3|esp|ah|pfcp|pppoe|gtpu|ecpri "
                "<string of hex digits (variable length, NIC dependent)>",
        .tokens = {
                (void *)&cmd_config_rss_hash_key_port,
@@ -2585,19 +2502,19 @@ cmdline_parse_token_string_t cmd_config_rxtx_ring_size_config =
                                 config, "config");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-                                portid, UINT16);
+                                portid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rxtxq =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
                                 rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_qid =
        TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-                             qid, UINT16);
+                             qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rsize =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
                                 rsize, "ring_size");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_size =
        TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-                             size, UINT16);
+                             size, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_rxtx_ring_size = {
        .f = cmd_config_rxtx_ring_size_parsed,
@@ -2686,11 +2603,11 @@ cmd_config_rxtx_queue_parsed(void *parsed_result,
 cmdline_parse_token_string_t cmd_config_rxtx_queue_port =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, port, "port");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_portid =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_queue_rxtxq =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_qid =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_queue_opname =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, opname,
                                                "start#stop");
@@ -2766,13 +2683,13 @@ cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_port =
                                                port, "port");
 cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
-                                               port_id, UINT16);
+                                               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_rxtxq =
        TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
                                                rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_qid =
        TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
-                                               qid, UINT16);
+                                               qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_opname =
        TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
                                                opname, "deferred_start");
@@ -2808,11 +2725,11 @@ struct cmd_setup_rxtx_queue {
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_port =
        TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, port, "port");
 cmdline_parse_token_num_t cmd_setup_rxtx_queue_portid =
-       TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_rxtxq =
        TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_setup_rxtx_queue_qid =
-       TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_setup =
        TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, setup, "setup");
 
@@ -3021,7 +2938,7 @@ cmdline_parse_token_string_t cmd_config_rss_reta_port =
 cmdline_parse_token_string_t cmd_config_rss_reta_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, keyword, "config");
 cmdline_parse_token_num_t cmd_config_rss_reta_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rss_reta_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, name, "rss");
 cmdline_parse_token_string_t cmd_config_rss_reta_list_name =
@@ -3132,13 +3049,13 @@ cmdline_parse_token_string_t cmd_showport_reta_show =
 cmdline_parse_token_string_t cmd_showport_reta_port =
        TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, port, "port");
 cmdline_parse_token_num_t cmd_showport_reta_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_rss =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss");
 cmdline_parse_token_string_t cmd_showport_reta_reta =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, reta, "reta");
 cmdline_parse_token_num_t cmd_showport_reta_size =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, RTE_UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_list_of_items =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_reta,
                                        list_of_items, NULL);
@@ -3183,7 +3100,8 @@ cmdline_parse_token_string_t cmd_showport_rss_hash_show =
 cmdline_parse_token_string_t cmd_showport_rss_hash_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port");
 cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id,
+                                RTE_UINT16);
 cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
                                 "rss-hash");
@@ -3287,7 +3205,7 @@ cmdline_parse_token_string_t cmd_config_dcb_port =
 cmdline_parse_token_string_t cmd_config_dcb_config =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, config, "config");
 cmdline_parse_token_num_t cmd_config_dcb_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_dcb_dcb =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, dcb, "dcb");
 cmdline_parse_token_string_t cmd_config_dcb_vt =
@@ -3295,7 +3213,7 @@ cmdline_parse_token_string_t cmd_config_dcb_vt =
 cmdline_parse_token_string_t cmd_config_dcb_vt_en =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, vt_en, "on#off");
 cmdline_parse_token_num_t cmd_config_dcb_num_tcs =
-        TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, RTE_UINT8);
 cmdline_parse_token_string_t cmd_config_dcb_pfc=
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, pfc, "pfc");
 cmdline_parse_token_string_t cmd_config_dcb_pfc_en =
@@ -3394,7 +3312,7 @@ cmdline_parse_token_string_t cmd_config_burst_all =
 cmdline_parse_token_string_t cmd_config_burst_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_burst, name, "burst");
 cmdline_parse_token_num_t cmd_config_burst_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_burst = {
        .f = cmd_config_burst_parsed,
@@ -3463,7 +3381,7 @@ cmdline_parse_token_string_t cmd_config_thresh_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_thresh, name,
                                "txpt#txht#txwt#rxpt#rxht#rxwt");
 cmdline_parse_token_num_t cmd_config_thresh_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_config_thresh = {
        .f = cmd_config_thresh_parsed,
@@ -3527,7 +3445,7 @@ cmdline_parse_token_string_t cmd_config_threshold_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_threshold, name,
                                                "txfreet#txrst#rxfreet");
 cmdline_parse_token_num_t cmd_config_threshold_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_threshold = {
        .f = cmd_config_threshold_parsed,
@@ -3733,7 +3651,7 @@ cmdline_parse_token_string_t cmd_setmask_mask =
        TOKEN_STRING_INITIALIZER(struct cmd_setmask_result, mask,
                                 "coremask#portmask");
 cmdline_parse_token_num_t cmd_setmask_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue, UINT64);
+       TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue, RTE_UINT64);
 
 cmdline_parse_inst_t cmd_set_fwd_mask = {
        .f = cmd_set_mask_parsed,
@@ -3779,7 +3697,7 @@ cmdline_parse_token_string_t cmd_set_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_result, what,
                                 "nbport#nbcore#burst#verbose");
 cmdline_parse_token_num_t cmd_set_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_numbers = {
        .f = cmd_set_parsed,
@@ -3827,7 +3745,7 @@ cmdline_parse_token_string_t cmd_set_log_log =
 cmdline_parse_token_string_t cmd_set_log_type =
        TOKEN_STRING_INITIALIZER(struct cmd_set_log_result, type, NULL);
 cmdline_parse_token_num_t cmd_set_log_level =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_set_log = {
        .f = cmd_set_log_parsed,
@@ -4099,7 +4017,7 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_all_all =
                                 all, "all");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_all_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_all_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter_all = {
        .f = cmd_rx_vlan_filter_all_parsed,
@@ -4263,10 +4181,10 @@ cmdline_parse_token_string_t cmd_vlan_tpid_what =
                                 what, "tpid");
 cmdline_parse_token_num_t cmd_vlan_tpid_tpid =
        TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-                             tp_id, UINT16);
+                             tp_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vlan_tpid_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_vlan_tpid = {
        .f = cmd_vlan_tpid_parsed,
@@ -4313,10 +4231,10 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_what =
                                 what, "add#rm");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_vlanid =
        TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-                             vlan_id, UINT16);
+                             vlan_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_rx_vlan_filter_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter = {
        .f = cmd_rx_vlan_filter_parsed,
@@ -4369,10 +4287,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_set =
                                 set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_vlanid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-                             vlan_id, UINT16);
+                             vlan_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_set = {
        .f = cmd_tx_vlan_set_parsed,
@@ -4426,13 +4344,13 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_set =
                set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-               port_id, UINT16);
+               port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-               vlan_id, UINT16);
+               vlan_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid_outer =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-               vlan_id_outer, UINT16);
+               vlan_id_outer, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_set_qinq = {
        .f = cmd_tx_vlan_set_qinq_parsed,
@@ -4484,10 +4402,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_pvid =
                                 pvid, "pvid");
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-                            port_id, UINT16);
+                            port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_vlan_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-                             vlan_id, UINT16);
+                             vlan_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
                                 mode, "on#off");
@@ -4542,7 +4460,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_reset_reset =
                                 reset, "reset");
 cmdline_parse_token_num_t cmd_tx_vlan_reset_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_reset_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_reset = {
        .f = cmd_tx_vlan_reset_parsed,
@@ -4748,7 +4666,7 @@ cmdline_parse_token_string_t cmd_csum_hwsw =
                                hwsw, "hw#sw");
 cmdline_parse_token_num_t cmd_csum_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_csum_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_csum_set = {
        .f = cmd_csum_parsed,
@@ -4819,7 +4737,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
                                onoff, "on#off");
 cmdline_parse_token_num_t cmd_csum_tunnel_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_csum_tunnel = {
        .f = cmd_csum_tunnel_parsed,
@@ -4907,10 +4825,10 @@ cmdline_parse_token_string_t cmd_tso_set_mode =
                                mode, "set");
 cmdline_parse_token_num_t cmd_tso_set_tso_segsz =
        TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-                               tso_segsz, UINT16);
+                               tso_segsz, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tso_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tso_set = {
        .f = cmd_tso_set_parsed,
@@ -5056,10 +4974,10 @@ cmdline_parse_token_string_t cmd_tunnel_tso_set_mode =
                                mode, "set");
 cmdline_parse_token_num_t cmd_tunnel_tso_set_tso_segsz =
        TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
-                               tso_segsz, UINT16);
+                               tso_segsz, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tunnel_tso_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_tso_set = {
        .f = cmd_tunnel_tso_set_parsed,
@@ -5123,7 +5041,7 @@ cmdline_parse_token_string_t cmd_gro_enable_port =
                        cmd_keyword, "port");
 cmdline_parse_token_num_t cmd_gro_enable_pid =
        TOKEN_NUM_INITIALIZER(struct cmd_gro_enable_result,
-                       cmd_pid, UINT16);
+                       cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_gro_enable_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result,
                        cmd_keyword, "gro");
@@ -5173,7 +5091,7 @@ cmdline_parse_token_string_t cmd_gro_show_port =
                        cmd_port, "port");
 cmdline_parse_token_num_t cmd_gro_show_pid =
        TOKEN_NUM_INITIALIZER(struct cmd_gro_show_result,
-                       cmd_pid, UINT16);
+                       cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_gro_show_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_gro_show_result,
                        cmd_keyword, "gro");
@@ -5223,7 +5141,7 @@ cmdline_parse_token_string_t cmd_gro_flush_flush =
                        cmd_flush, "flush");
 cmdline_parse_token_num_t cmd_gro_flush_cycles =
        TOKEN_NUM_INITIALIZER(struct cmd_gro_flush_result,
-                       cmd_cycles, UINT8);
+                       cmd_cycles, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_gro_flush = {
        .f = cmd_gro_flush_parsed,
@@ -5273,7 +5191,7 @@ cmdline_parse_token_string_t cmd_gso_enable_mode =
                        cmd_mode, "on#off");
 cmdline_parse_token_num_t cmd_gso_enable_pid =
        TOKEN_NUM_INITIALIZER(struct cmd_gso_enable_result,
-                       cmd_pid, UINT16);
+                       cmd_pid, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_enable = {
        .f = cmd_gso_enable_parsed,
@@ -5332,7 +5250,7 @@ cmdline_parse_token_string_t cmd_gso_size_segsz =
                                cmd_segsz, "segsz");
 cmdline_parse_token_num_t cmd_gso_size_size =
        TOKEN_NUM_INITIALIZER(struct cmd_gso_size_result,
-                               cmd_size, UINT16);
+                               cmd_size, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_size = {
        .f = cmd_gso_size_parsed,
@@ -5390,7 +5308,7 @@ cmdline_parse_token_string_t cmd_gso_show_keyword =
                                cmd_keyword, "gso");
 cmdline_parse_token_num_t cmd_gso_show_pid =
        TOKEN_NUM_INITIALIZER(struct cmd_gso_show_result,
-                               cmd_pid, UINT16);
+                               cmd_pid, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_show = {
        .f = cmd_gso_show_parsed,
@@ -5533,7 +5451,7 @@ cmdline_parse_token_string_t cmd_setbypass_mode_value =
                        value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_mode_port =
        TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_mode = {
        .f = cmd_set_bypass_mode_parsed,
@@ -5639,7 +5557,7 @@ cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
                        mode_value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_event_port =
        TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_event = {
        .f = cmd_set_bypass_event_parsed,
@@ -5805,7 +5723,7 @@ cmdline_parse_token_string_t cmd_showbypass_config_config =
                        config, "config");
 cmdline_parse_token_num_t cmd_showbypass_config_port =
        TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_show_bypass_config = {
        .f = cmd_show_bypass_config_parsed,
@@ -5854,10 +5772,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result,
                mode, "mode");
 cmdline_parse_token_num_t cmd_setbonding_mode_value =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-               value, UINT8);
+               value, RTE_UINT8);
 cmdline_parse_token_num_t cmd_setbonding_mode_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-               port_id, UINT16);
+               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_mode = {
                .f = cmd_set_bonding_mode_parsed,
@@ -5931,7 +5849,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
                dedicated_queues, "dedicated_queues");
 cmdline_parse_token_num_t cmd_setbonding_lacp_dedicated_queues_port_id =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
-               port_id, UINT16);
+               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_mode =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
                mode, "enable#disable");
@@ -5999,7 +5917,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
                balance_xmit_policy, "balance_xmit_policy");
 cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
-               port_id, UINT16);
+               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
                policy, "l2#l23#l34");
@@ -6147,7 +6065,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result,
                config, "config");
 cmdline_parse_token_num_t cmd_showbonding_config_port =
 TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result,
-               port_id, UINT16);
+               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_show_bonding_config = {
                .f = cmd_show_bonding_config_parsed,
@@ -6200,10 +6118,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result,
                primary, "primary");
 cmdline_parse_token_num_t cmd_setbonding_primary_slave =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-               slave_id, UINT16);
+               slave_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_setbonding_primary_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-               port_id, UINT16);
+               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_primary = {
                .f = cmd_set_bonding_primary_parsed,
@@ -6258,10 +6176,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result,
                slave, "slave");
 cmdline_parse_token_num_t cmd_addbonding_slave_slaveid =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-               slave_id, UINT16);
+               slave_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_addbonding_slave_port =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-               port_id, UINT16);
+               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_add_bonding_slave = {
                .f = cmd_add_bonding_slave_parsed,
@@ -6316,10 +6234,10 @@ cmdline_parse_token_string_t cmd_removebonding_slave_slave =
                                slave, "slave");
 cmdline_parse_token_num_t cmd_removebonding_slave_slaveid =
                TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-                               slave_id, UINT16);
+                               slave_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_removebonding_slave_port =
                TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_remove_bonding_slave = {
                .f = cmd_remove_bonding_slave_parsed,
@@ -6398,10 +6316,10 @@ cmdline_parse_token_string_t cmd_createbonded_device_device =
                                device, "device");
 cmdline_parse_token_num_t cmd_createbonded_device_mode =
                TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
-                               mode, UINT8);
+                               mode, RTE_UINT8);
 cmdline_parse_token_num_t cmd_createbonded_device_socket =
                TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
-                               socket, UINT8);
+                               socket, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_create_bonded_device = {
                .f = cmd_create_bonded_device_parsed,
@@ -6454,7 +6372,7 @@ cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac =
                                "mac_addr");
 cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum =
                TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result,
-                               port_num, UINT16);
+                               port_num, RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr =
                TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address);
 
@@ -6507,10 +6425,10 @@ cmdline_parse_token_string_t cmd_set_bond_mon_period_mon_period =
                                mon_period,     "mon_period");
 cmdline_parse_token_num_t cmd_set_bond_mon_period_portnum =
                TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
-                               port_num, UINT16);
+                               port_num, RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_bond_mon_period_period_ms =
                TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
-                               period_ms, UINT32);
+                               period_ms, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_set_bond_mon_period = {
                .f = cmd_set_bond_mon_period_parsed,
@@ -6569,7 +6487,7 @@ cmdline_parse_token_string_t cmd_set_bonding_agg_mode_agg_mode =
 
 cmdline_parse_token_num_t cmd_set_bonding_agg_mode_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
-                               port_num, UINT16);
+                               port_num, RTE_UINT16);
 
 cmdline_parse_token_string_t cmd_set_bonding_agg_mode_policy_string =
        TOKEN_STRING_INITIALIZER(
@@ -6757,11 +6675,13 @@ cmdline_parse_token_string_t cmd_set_burst_tx_retry_tx =
 cmdline_parse_token_string_t cmd_set_burst_tx_retry_delay =
        TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, delay, "delay");
 cmdline_parse_token_num_t cmd_set_burst_tx_retry_time =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time,
+                                RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_burst_tx_retry_retry =
        TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry, "retry");
 cmdline_parse_token_num_t cmd_set_burst_tx_retry_retry_num =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num,
+                                RTE_UINT32);
 
 cmdline_parse_inst_t cmd_set_burst_tx_retry = {
        .f = cmd_set_burst_tx_retry_parsed,
@@ -6819,7 +6739,7 @@ cmdline_parse_token_string_t cmd_setpromisc_portall =
                                 "all");
 cmdline_parse_token_num_t cmd_setpromisc_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_set_promisc_mode_result, port_num,
-                             UINT16);
+                             RTE_UINT16);
 cmdline_parse_token_string_t cmd_setpromisc_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, mode,
                                 "on#off");
@@ -6893,7 +6813,7 @@ cmdline_parse_token_string_t cmd_setallmulti_portall =
                                 "all");
 cmdline_parse_token_num_t cmd_setallmulti_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_set_allmulti_mode_result, port_num,
-                             UINT16);
+                             RTE_UINT16);
 cmdline_parse_token_string_t cmd_setallmulti_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_allmulti_mode_result, mode,
                                 "on#off");
@@ -6971,25 +6891,25 @@ cmdline_parse_token_string_t cmd_lfc_set_high_water_str =
                                hw_str, "high_water");
 cmdline_parse_token_num_t cmd_lfc_set_high_water =
        TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-                               high_water, UINT32);
+                               high_water, RTE_UINT32);
 cmdline_parse_token_string_t cmd_lfc_set_low_water_str =
        TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
                                lw_str, "low_water");
 cmdline_parse_token_num_t cmd_lfc_set_low_water =
        TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-                               low_water, UINT32);
+                               low_water, RTE_UINT32);
 cmdline_parse_token_string_t cmd_lfc_set_pause_time_str =
        TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
                                pt_str, "pause_time");
 cmdline_parse_token_num_t cmd_lfc_set_pause_time =
        TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-                               pause_time, UINT16);
+                               pause_time, RTE_UINT16);
 cmdline_parse_token_string_t cmd_lfc_set_send_xon_str =
        TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
                                xon_str, "send_xon");
 cmdline_parse_token_num_t cmd_lfc_set_send_xon =
        TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-                               send_xon, UINT16);
+                               send_xon, RTE_UINT16);
 cmdline_parse_token_string_t cmd_lfc_set_mac_ctrl_frame_fwd_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
                                mac_ctrl_frame_fwd, "mac_ctrl_frame_fwd");
@@ -7004,7 +6924,7 @@ cmdline_parse_token_string_t cmd_lfc_set_autoneg =
                                autoneg, "on#off");
 cmdline_parse_token_num_t cmd_lfc_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 /* forward declaration */
 static void
@@ -7300,19 +7220,19 @@ cmdline_parse_token_string_t cmd_pfc_set_tx_mode =
                                tx_pfc_mode, "on#off");
 cmdline_parse_token_num_t cmd_pfc_set_high_water =
        TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-                               high_water, UINT32);
+                               high_water, RTE_UINT32);
 cmdline_parse_token_num_t cmd_pfc_set_low_water =
        TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-                               low_water, UINT32);
+                               low_water, RTE_UINT32);
 cmdline_parse_token_num_t cmd_pfc_set_pause_time =
        TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-                               pause_time, UINT16);
+                               pause_time, RTE_UINT16);
 cmdline_parse_token_num_t cmd_pfc_set_priority =
        TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-                               priority, UINT8);
+                               priority, RTE_UINT8);
 cmdline_parse_token_num_t cmd_pfc_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_priority_flow_control_set = {
        .f = cmd_priority_flow_ctrl_set_parsed,
@@ -7450,7 +7370,7 @@ cmdline_parse_token_string_t cmd_start_tx_first_n_tx_first =
                        tx_first, "tx_first");
 cmdline_parse_token_num_t cmd_start_tx_first_n_tx_num =
        TOKEN_NUM_INITIALIZER(struct cmd_start_tx_first_n_result,
-                       tx_num, UINT32);
+                       tx_num, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_start_tx_first_n = {
        .f = cmd_start_tx_first_n_parsed,
@@ -7481,7 +7401,8 @@ cmdline_parse_token_string_t cmd_set_link_up_link_up =
 cmdline_parse_token_string_t cmd_set_link_up_port =
        TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_up_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id,
+                               RTE_UINT16);
 
 static void cmd_set_link_up_parsed(__rte_unused void *parsed_result,
                             __rte_unused struct cmdline *cl,
@@ -7520,7 +7441,8 @@ cmdline_parse_token_string_t cmd_set_link_down_link_down =
 cmdline_parse_token_string_t cmd_set_link_down_port =
        TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_down_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id,
+                               RTE_UINT16);
 
 static void cmd_set_link_down_parsed(
                                __rte_unused void *parsed_result,
@@ -7628,9 +7550,11 @@ static void cmd_showportall_parsed(void *parsed_result,
        else if (!strcmp(res->what, "xstats"))
                RTE_ETH_FOREACH_DEV(i)
                        nic_xstats_display(i);
+#if defined(RTE_NET_I40E) || defined(RTE_NET_IXGBE)
        else if (!strcmp(res->what, "fdir"))
                RTE_ETH_FOREACH_DEV(i)
                        fdir_get_infos(i);
+#endif
        else if (!strcmp(res->what, "stat_qmap"))
                RTE_ETH_FOREACH_DEV(i)
                        nic_stats_mapping_display(i);
@@ -7694,8 +7618,10 @@ static void cmd_showport_parsed(void *parsed_result,
                nic_stats_display(res->portnum);
        else if (!strcmp(res->what, "xstats"))
                nic_xstats_display(res->portnum);
+#if defined(RTE_NET_I40E) || defined(RTE_NET_IXGBE)
        else if (!strcmp(res->what, "fdir"))
                 fdir_get_infos(res->portnum);
+#endif
        else if (!strcmp(res->what, "stat_qmap"))
                nic_stats_mapping_display(res->portnum);
        else if (!strcmp(res->what, "dcb_tc"))
@@ -7713,7 +7639,7 @@ cmdline_parse_token_string_t cmd_showport_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_result, what,
                                 "info#summary#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
 cmdline_parse_token_num_t cmd_showport_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_showport = {
        .f = cmd_showport_parsed,
@@ -7803,7 +7729,8 @@ cmdline_parse_token_string_t cmd_showeeprom_show =
 cmdline_parse_token_string_t cmd_showeeprom_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showeeprom_result, port, "port");
 cmdline_parse_token_num_t cmd_showeeprom_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_showeeprom_result, portnum, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_showeeprom_result, portnum,
+                       RTE_UINT16);
 cmdline_parse_token_string_t cmd_showeeprom_type =
        TOKEN_STRING_INITIALIZER(struct cmd_showeeprom_result, type, "module_eeprom#eeprom");
 
@@ -7849,9 +7776,11 @@ cmdline_parse_token_string_t cmd_showqueue_type =
 cmdline_parse_token_string_t cmd_showqueue_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, what, "info");
 cmdline_parse_token_num_t cmd_showqueue_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum,
+               RTE_UINT16);
 cmdline_parse_token_num_t cmd_showqueue_queuenum =
-       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum,
+               RTE_UINT16);
 
 cmdline_parse_inst_t cmd_showqueue = {
        .f = cmd_showqueue_parsed,
@@ -7932,9 +7861,9 @@ cmdline_parse_token_string_t cmd_read_reg_read =
 cmdline_parse_token_string_t cmd_read_reg_reg =
        TOKEN_STRING_INITIALIZER(struct cmd_read_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_read_reg_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_reg_off =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_read_reg = {
        .f = cmd_read_reg_parsed,
@@ -7977,16 +7906,16 @@ cmdline_parse_token_string_t cmd_read_reg_bit_field_regfield =
                                 regfield, "regfield");
 cmdline_parse_token_num_t cmd_read_reg_bit_field_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, port_id,
-                             UINT16);
+                             RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, reg_off,
-                             UINT32);
+                             RTE_UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_bit1_pos =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit1_pos,
-                             UINT8);
+                             RTE_UINT8);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_bit2_pos =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit2_pos,
-                             UINT8);
+                             RTE_UINT8);
 
 cmdline_parse_inst_t cmd_read_reg_bit_field = {
        .f = cmd_read_reg_bit_field_parsed,
@@ -8028,11 +7957,14 @@ cmdline_parse_token_string_t cmd_read_reg_bit_regbit =
        TOKEN_STRING_INITIALIZER(struct cmd_read_reg_bit_result,
                                 regbit, "regbit");
 cmdline_parse_token_num_t cmd_read_reg_bit_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id,
+                                RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_reg_off =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off,
+                                RTE_UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_bit_pos =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos,
+                                RTE_UINT8);
 
 cmdline_parse_inst_t cmd_read_reg_bit = {
        .f = cmd_read_reg_bit_parsed,
@@ -8071,11 +8003,11 @@ cmdline_parse_token_string_t cmd_write_reg_write =
 cmdline_parse_token_string_t cmd_write_reg_reg =
        TOKEN_STRING_INITIALIZER(struct cmd_write_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_write_reg_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_reg_off =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, RTE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_write_reg = {
        .f = cmd_write_reg_parsed,
@@ -8120,19 +8052,19 @@ cmdline_parse_token_string_t cmd_write_reg_bit_field_regfield =
                                 regfield, "regfield");
 cmdline_parse_token_num_t cmd_write_reg_bit_field_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, port_id,
-                             UINT16);
+                             RTE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, reg_off,
-                             UINT32);
+                             RTE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_bit1_pos =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit1_pos,
-                             UINT8);
+                             RTE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_bit2_pos =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit2_pos,
-                             UINT8);
+                             RTE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_value =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, value,
-                             UINT32);
+                             RTE_UINT32);
 
 cmdline_parse_inst_t cmd_write_reg_bit_field = {
        .f = cmd_write_reg_bit_field_parsed,
@@ -8178,13 +8110,17 @@ cmdline_parse_token_string_t cmd_write_reg_bit_regbit =
        TOKEN_STRING_INITIALIZER(struct cmd_write_reg_bit_result,
                                 regbit, "regbit");
 cmdline_parse_token_num_t cmd_write_reg_bit_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id,
+                                RTE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_reg_off =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off,
+                                RTE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_bit_pos =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos,
+                                RTE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value,
+                                RTE_UINT8);
 
 cmdline_parse_inst_t cmd_write_reg_bit = {
        .f = cmd_write_reg_bit_parsed,
@@ -8230,11 +8166,14 @@ cmdline_parse_token_string_t cmd_read_rxd_txd_rxd_txd =
        TOKEN_STRING_INITIALIZER(struct cmd_read_rxd_txd_result, rxd_txd,
                                 "rxd#txd");
 cmdline_parse_token_num_t cmd_read_rxd_txd_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id,
+                                RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_queue_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id,
+                                RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_desc_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id,
+                                RTE_UINT16);
 
 cmdline_parse_inst_t cmd_read_rxd_txd = {
        .f = cmd_read_rxd_txd_parsed,
@@ -8312,7 +8251,7 @@ cmdline_parse_token_string_t cmd_mac_addr_what =
                                "add#remove#set");
 cmdline_parse_token_num_t cmd_mac_addr_portnum =
                TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num,
-                                       UINT16);
+                                       RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_mac_addr_addr =
                TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -8358,7 +8297,8 @@ cmdline_parse_token_string_t cmd_eth_peer_set =
 cmdline_parse_token_string_t cmd_eth_peer =
        TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, eth_peer, "eth-peer");
 cmdline_parse_token_num_t cmd_eth_peer_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id,
+               RTE_UINT16);
 cmdline_parse_token_string_t cmd_eth_peer_addr =
        TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, peer_addr, NULL);
 
@@ -8407,13 +8347,13 @@ cmdline_parse_token_string_t cmd_setqmap_what =
                                 what, "tx#rx");
 cmdline_parse_token_num_t cmd_setqmap_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_setqmap_queueid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-                             queue_id, UINT16);
+                             queue_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_setqmap_mapvalue =
        TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-                             map_value, UINT8);
+                             map_value, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_set_qmap = {
        .f = cmd_set_qmap_parsed,
@@ -8593,7 +8533,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_hash_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_uc_hash_table,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_uc_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
                                 what, "uta");
@@ -8654,7 +8594,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_all_hash_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_uc_all_hash_table,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_uc_all_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
                                 what, "uta");
@@ -8711,13 +8651,13 @@ cmdline_parse_token_string_t cmd_setvf_traffic_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_setvf_traffic_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setvf_traffic_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
                                 vf, "vf");
 cmdline_parse_token_num_t cmd_setvf_traffic_vfid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-                             vf_id, UINT8);
+                             vf_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_setvf_traffic_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
                                 what, "tx#rx");
@@ -8799,13 +8739,13 @@ cmdline_parse_token_string_t cmd_set_vf_rxmode_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
                                 vf, "vf");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_vfid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-                             vf_id, UINT8);
+                             vf_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
                                 what, "rxmode");
@@ -8882,13 +8822,13 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_port =
                                port,"port");
 cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-                               port_num, UINT16);
+                               port_num, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
                                vf,"vf");
 cmdline_parse_token_num_t cmd_vf_mac_addr_vfnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-                               vf_num, UINT8);
+                               vf_num, RTE_UINT8);
 cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr =
        TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result,
                                address);
@@ -8973,19 +8913,19 @@ cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_what =
                                 what, "add#rm");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vlanid =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-                             vlan_id, UINT16);
+                             vlan_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_port =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
                                 port, "port");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
                                 vf, "vf");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vf_mask =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-                             vf_mask, UINT64);
+                             vf_mask, RTE_UINT64);
 
 cmdline_parse_inst_t cmd_vf_rxvlan_filter = {
        .f = cmd_vf_rx_vlan_filter_parsed,
@@ -9040,19 +8980,19 @@ cmdline_parse_token_string_t cmd_queue_rate_limit_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_queue_rate_limit_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-                               port_num, UINT16);
+                               port_num, RTE_UINT16);
 cmdline_parse_token_string_t cmd_queue_rate_limit_queue =
        TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
                                queue, "queue");
 cmdline_parse_token_num_t cmd_queue_rate_limit_queuenum =
        TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-                               queue_num, UINT8);
+                               queue_num, RTE_UINT8);
 cmdline_parse_token_string_t cmd_queue_rate_limit_rate =
        TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
                                rate, "rate");
 cmdline_parse_token_num_t cmd_queue_rate_limit_ratenum =
        TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-                               rate_num, UINT16);
+                               rate_num, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_queue_rate_limit = {
        .f = cmd_queue_rate_limit_parsed,
@@ -9110,25 +9050,25 @@ cmdline_parse_token_string_t cmd_vf_rate_limit_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_vf_rate_limit_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-                               port_num, UINT16);
+                               port_num, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
                                vf, "vf");
 cmdline_parse_token_num_t cmd_vf_rate_limit_vfnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-                               vf_num, UINT8);
+                               vf_num, RTE_UINT8);
 cmdline_parse_token_string_t cmd_vf_rate_limit_rate =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
                                rate, "rate");
 cmdline_parse_token_num_t cmd_vf_rate_limit_ratenum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-                               rate_num, UINT16);
+                               rate_num, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_q_msk =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
                                q_msk, "queue_mask");
 cmdline_parse_token_num_t cmd_vf_rate_limit_q_msk_val =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-                               q_msk_val, UINT64);
+                               q_msk_val, RTE_UINT64);
 
 cmdline_parse_inst_t cmd_vf_rate_limit = {
        .f = cmd_vf_rate_limit_parsed,
@@ -9191,10 +9131,10 @@ cmdline_parse_token_string_t cmd_tunnel_udp_config_what =
                                what, "add#rm");
 cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port =
        TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
-                               udp_port, UINT16);
+                               udp_port, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tunnel_udp_config_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_udp_config = {
        .f = cmd_tunnel_udp_config_parsed,
@@ -9264,7 +9204,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_config =
                                 "config");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, port_id,
-                             UINT16);
+                             RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_port =
        TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port,
                                 udp_tunnel_port,
@@ -9277,7 +9217,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
                                 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
        TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
-                             UINT16);
+                             RTE_UINT16);
 
 cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
        .f = cmd_cfg_tunnel_udp_port_parsed,
@@ -9295,62 +9235,6 @@ cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
        },
 };
 
-/* *** GLOBAL CONFIG *** */
-struct cmd_global_config_result {
-       cmdline_fixed_string_t cmd;
-       portid_t port_id;
-       cmdline_fixed_string_t cfg_type;
-       uint8_t len;
-};
-
-static void
-cmd_global_config_parsed(void *parsed_result,
-                        __rte_unused struct cmdline *cl,
-                        __rte_unused void *data)
-{
-       struct cmd_global_config_result *res = parsed_result;
-       struct rte_eth_global_cfg conf;
-       int ret;
-
-       memset(&conf, 0, sizeof(conf));
-       conf.cfg_type = RTE_ETH_GLOBAL_CFG_TYPE_GRE_KEY_LEN;
-       conf.cfg.gre_key_len = res->len;
-       ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_NONE,
-                                     RTE_ETH_FILTER_SET, &conf);
-#ifdef RTE_NET_I40E
-       if (ret == -ENOTSUP)
-               ret = rte_pmd_i40e_set_gre_key_len(res->port_id, res->len);
-#endif
-       if (ret != 0)
-               printf("Global config error\n");
-}
-
-cmdline_parse_token_string_t cmd_global_config_cmd =
-       TOKEN_STRING_INITIALIZER(struct cmd_global_config_result, cmd,
-               "global_config");
-cmdline_parse_token_num_t cmd_global_config_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id,
-                              UINT16);
-cmdline_parse_token_string_t cmd_global_config_type =
-       TOKEN_STRING_INITIALIZER(struct cmd_global_config_result,
-               cfg_type, "gre-key-len");
-cmdline_parse_token_num_t cmd_global_config_gre_key_len =
-       TOKEN_NUM_INITIALIZER(struct cmd_global_config_result,
-               len, UINT8);
-
-cmdline_parse_inst_t cmd_global_config = {
-       .f = cmd_global_config_parsed,
-       .data = (void *)NULL,
-       .help_str = "global_config <port_id> gre-key-len <key_len>",
-       .tokens = {
-               (void *)&cmd_global_config_cmd,
-               (void *)&cmd_global_config_port_id,
-               (void *)&cmd_global_config_type,
-               (void *)&cmd_global_config_gre_key_len,
-               NULL,
-       },
-};
-
 /* *** CONFIGURE VM MIRROR VLAN/POOL RULE *** */
 struct cmd_set_mirror_mask_result {
        cmdline_fixed_string_t set;
@@ -9373,13 +9257,13 @@ cmdline_parse_token_string_t cmd_mirror_mask_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_mirror_mask_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_mirror_mask_mirror =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
                                mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_mirror_mask_ruleid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-                               rule_id, UINT8);
+                               rule_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_mask_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
                                what, "pool-mirror-up#pool-mirror-down"
@@ -9392,7 +9276,7 @@ cmdline_parse_token_string_t cmd_mirror_mask_dstpool =
                                dstpool, "dst-pool");
 cmdline_parse_token_num_t cmd_mirror_mask_poolid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-                               dstpool_id, UINT8);
+                               dstpool_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_mask_on =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
                                on, "on#off");
@@ -9488,13 +9372,13 @@ cmdline_parse_token_string_t cmd_mirror_link_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_mirror_link_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_mirror_link_mirror =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
                                mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_mirror_link_ruleid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-                           rule_id, UINT8);
+                           rule_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_link_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
                                what, "uplink-mirror#downlink-mirror");
@@ -9503,7 +9387,7 @@ cmdline_parse_token_string_t cmd_mirror_link_dstpool =
                                dstpool, "dst-pool");
 cmdline_parse_token_num_t cmd_mirror_link_poolid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-                               dstpool_id, UINT8);
+                               dstpool_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_link_on =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
                                on, "on#off");
@@ -9574,13 +9458,13 @@ cmdline_parse_token_string_t cmd_rm_mirror_rule_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_rm_mirror_rule_mirror =
        TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
                                mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_ruleid =
        TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-                               rule_id, UINT8);
+                               rule_id, RTE_UINT8);
 
 static void
 cmd_reset_mirror_rule_parsed(void *parsed_result,
@@ -9827,7 +9711,7 @@ cmdline_parse_token_string_t cmd_queue_region_port =
        TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, port, "port");
 cmdline_parse_token_num_t cmd_queue_region_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_queue_region_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
                                 cmd, "queue-region");
@@ -9836,19 +9720,19 @@ cmdline_parse_token_string_t cmd_queue_region_id =
                                region, "region_id");
 cmdline_parse_token_num_t cmd_queue_region_index =
        TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-                               region_id, UINT8);
+                               region_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_queue_region_queue_start_index =
        TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
                                queue_start_index, "queue_start_index");
 cmdline_parse_token_num_t cmd_queue_region_queue_id =
        TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-                               queue_id, UINT8);
+                               queue_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_queue_region_queue_num =
        TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
                                queue_num, "queue_num");
 cmdline_parse_token_num_t cmd_queue_region_queue_num_value =
        TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-                               queue_num_value, UINT8);
+                               queue_num_value, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_queue_region = {
        .f = cmd_queue_region_parsed,
@@ -9927,7 +9811,7 @@ cmdline_parse_token_string_t cmd_region_flowtype_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_region_flowtype_port_index =
        TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_region_flowtype_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
                                cmd, "queue-region");
@@ -9936,13 +9820,13 @@ cmdline_parse_token_string_t cmd_region_flowtype_index =
                                region, "region_id");
 cmdline_parse_token_num_t cmd_region_flowtype_id =
        TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-                               region_id, UINT8);
+                               region_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_region_flowtype_flow_index =
        TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
                                flowtype, "flowtype");
 cmdline_parse_token_num_t cmd_region_flowtype_flow_id =
        TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-                               flowtype_id, UINT8);
+                               flowtype_id, RTE_UINT8);
 cmdline_parse_inst_t cmd_region_flowtype = {
        .f = cmd_region_flowtype_parsed,
        .data = NULL,
@@ -10018,7 +9902,7 @@ cmdline_parse_token_string_t cmd_user_priority_region_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_user_priority_region_port_index =
        TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_user_priority_region_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
                                cmd, "queue-region");
@@ -10027,13 +9911,13 @@ cmdline_parse_token_string_t cmd_user_priority_region_UP =
                                user_priority, "UP");
 cmdline_parse_token_num_t cmd_user_priority_region_UP_id =
        TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-                               user_priority_id, UINT8);
+                               user_priority_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_user_priority_region_region =
        TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
                                region, "region_id");
 cmdline_parse_token_num_t cmd_user_priority_region_region_id =
        TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-                               region_id, UINT8);
+                               region_id, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_user_priority_region = {
        .f = cmd_user_priority_region_parsed,
@@ -10111,7 +9995,7 @@ cmdline_parse_token_string_t cmd_flush_queue_region_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_flush_queue_region_port_index =
        TOKEN_NUM_INITIALIZER(struct cmd_flush_queue_region_result,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flush_queue_region_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
                                cmd, "queue-region");
@@ -10192,7 +10076,7 @@ cmdline_parse_token_string_t cmd_show_queue_region_info_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_show_queue_region_info_port_index =
        TOKEN_NUM_INITIALIZER(struct cmd_show_queue_region_info,
-                               port_id, UINT16);
+                               port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_queue_region_info_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
                                cmd, "queue-region");
@@ -10213,88 +10097,29 @@ cmdline_parse_inst_t cmd_show_queue_region_info_all = {
 
 /* *** Filters Control *** */
 
-/* *** deal with flow director filter *** */
-struct cmd_flow_director_result {
-       cmdline_fixed_string_t flow_director_filter;
-       portid_t port_id;
-       cmdline_fixed_string_t mode;
-       cmdline_fixed_string_t mode_value;
-       cmdline_fixed_string_t ops;
-       cmdline_fixed_string_t flow;
-       cmdline_fixed_string_t flow_type;
-       cmdline_fixed_string_t ether;
-       uint16_t ether_type;
-       cmdline_fixed_string_t src;
-       cmdline_ipaddr_t ip_src;
-       uint16_t port_src;
-       cmdline_fixed_string_t dst;
-       cmdline_ipaddr_t ip_dst;
-       uint16_t port_dst;
-       cmdline_fixed_string_t verify_tag;
-       uint32_t verify_tag_value;
-       cmdline_fixed_string_t tos;
-       uint8_t tos_value;
-       cmdline_fixed_string_t proto;
-       uint8_t proto_value;
-       cmdline_fixed_string_t ttl;
-       uint8_t ttl_value;
-       cmdline_fixed_string_t vlan;
-       uint16_t vlan_value;
-       cmdline_fixed_string_t flexbytes;
-       cmdline_fixed_string_t flexbytes_value;
-       cmdline_fixed_string_t pf_vf;
-       cmdline_fixed_string_t drop;
-       cmdline_fixed_string_t queue;
-       uint16_t  queue_id;
-       cmdline_fixed_string_t fd_id;
-       uint32_t  fd_id_value;
-       cmdline_fixed_string_t mac;
-       struct rte_ether_addr mac_addr;
-       cmdline_fixed_string_t tunnel;
-       cmdline_fixed_string_t tunnel_type;
-       cmdline_fixed_string_t tunnel_id;
-       uint32_t tunnel_id_value;
-       cmdline_fixed_string_t packet;
-       char filepath[];
-};
-
-static inline int
-parse_flexbytes(const char *q_arg, uint8_t *flexbytes, uint16_t max_num)
-{
-       char s[256];
-       const char *p, *p0 = q_arg;
-       char *end;
-       unsigned long int_fld;
-       char *str_fld[max_num];
-       int i;
-       unsigned size;
-       int ret = -1;
-
-       p = strchr(p0, '(');
-       if (p == NULL)
-               return -1;
-       ++p;
-       p0 = strchr(p, ')');
-       if (p0 == NULL)
-               return -1;
+#define IPV4_ADDR_TO_UINT(ip_addr, ip) \
+do { \
+       if ((ip_addr).family == AF_INET) \
+               (ip) = (ip_addr).addr.ipv4.s_addr; \
+       else { \
+               printf("invalid parameter.\n"); \
+               return; \
+       } \
+} while (0)
 
-       size = p0 - p;
-       if (size >= sizeof(s))
-               return -1;
+#define IPV6_ADDR_TO_ARRAY(ip_addr, ip) \
+do { \
+       if ((ip_addr).family == AF_INET6) \
+               rte_memcpy(&(ip), \
+                                &((ip_addr).addr.ipv6), \
+                                sizeof(struct in6_addr)); \
+       else { \
+               printf("invalid parameter.\n"); \
+               return; \
+       } \
+} while (0)
 
-       snprintf(s, sizeof(s), "%.*s", size, p);
-       ret = rte_strsplit(s, sizeof(s), str_fld, max_num, ',');
-       if (ret < 0 || ret > max_num)
-               return -1;
-       for (i = 0; i < ret; i++) {
-               errno = 0;
-               int_fld = strtoul(str_fld[i], &end, 0);
-               if (errno != 0 || *end != '\0' || int_fld > UINT8_MAX)
-                       return -1;
-               flexbytes[i] = (uint8_t)int_fld;
-       }
-       return ret;
-}
+#ifdef RTE_NET_I40E
 
 static uint16_t
 str2flowtype(char *string)
@@ -10331,47 +10156,23 @@ str2flowtype(char *string)
        return RTE_ETH_FLOW_UNKNOWN;
 }
 
-static enum rte_eth_fdir_tunnel_type
-str2fdir_tunneltype(char *string)
-{
-       uint8_t i = 0;
-
-       static const struct {
-               char str[32];
-               enum rte_eth_fdir_tunnel_type type;
-       } tunneltype_str[] = {
-               {"NVGRE", RTE_FDIR_TUNNEL_TYPE_NVGRE},
-               {"VxLAN", RTE_FDIR_TUNNEL_TYPE_VXLAN},
-       };
-
-       for (i = 0; i < RTE_DIM(tunneltype_str); i++) {
-               if (!strcmp(tunneltype_str[i].str, string))
-                       return tunneltype_str[i].type;
-       }
-       return RTE_FDIR_TUNNEL_TYPE_UNKNOWN;
-}
-
-#define IPV4_ADDR_TO_UINT(ip_addr, ip) \
-do { \
-       if ((ip_addr).family == AF_INET) \
-               (ip) = (ip_addr).addr.ipv4.s_addr; \
-       else { \
-               printf("invalid parameter.\n"); \
-               return; \
-       } \
-} while (0)
-
-#define IPV6_ADDR_TO_ARRAY(ip_addr, ip) \
-do { \
-       if ((ip_addr).family == AF_INET6) \
-               rte_memcpy(&(ip), \
-                                &((ip_addr).addr.ipv6), \
-                                sizeof(struct in6_addr)); \
-       else { \
-               printf("invalid parameter.\n"); \
-               return; \
-       } \
-} while (0)
+/* *** deal with flow director filter *** */
+struct cmd_flow_director_result {
+       cmdline_fixed_string_t flow_director_filter;
+       portid_t port_id;
+       cmdline_fixed_string_t mode;
+       cmdline_fixed_string_t mode_value;
+       cmdline_fixed_string_t ops;
+       cmdline_fixed_string_t flow;
+       cmdline_fixed_string_t flow_type;
+       cmdline_fixed_string_t drop;
+       cmdline_fixed_string_t queue;
+       uint16_t  queue_id;
+       cmdline_fixed_string_t fd_id;
+       uint32_t  fd_id_value;
+       cmdline_fixed_string_t packet;
+       char filepath[];
+};
 
 static void
 cmd_flow_director_filter_parsed(void *parsed_result,
@@ -10379,246 +10180,57 @@ cmd_flow_director_filter_parsed(void *parsed_result,
                          __rte_unused void *data)
 {
        struct cmd_flow_director_result *res = parsed_result;
-       struct rte_eth_fdir_filter entry;
-       uint8_t flexbytes[RTE_ETH_FDIR_MAX_FLEXLEN];
-       char *end;
-       unsigned long vf_id;
        int ret = 0;
+       struct rte_pmd_i40e_flow_type_mapping
+                       mapping[RTE_PMD_I40E_FLOW_TYPE_MAX];
+       struct rte_pmd_i40e_pkt_template_conf conf;
+       uint16_t flow_type = str2flowtype(res->flow_type);
+       uint16_t i, port = res->port_id;
+       uint8_t add;
 
-       ret = rte_eth_dev_filter_supported(res->port_id, RTE_ETH_FILTER_FDIR);
-       if (ret < 0) {
-               printf("flow director is not supported on port %u.\n",
-                       res->port_id);
-               return;
-       }
-       memset(flexbytes, 0, sizeof(flexbytes));
-       memset(&entry, 0, sizeof(struct rte_eth_fdir_filter));
-
-       if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_MAC_VLAN) {
-               if (strcmp(res->mode_value, "MAC-VLAN")) {
-                       printf("Please set mode to MAC-VLAN.\n");
-                       return;
-               }
-       } else if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_TUNNEL) {
-               if (strcmp(res->mode_value, "Tunnel")) {
-                       printf("Please set mode to Tunnel.\n");
-                       return;
-               }
-       } else {
-               if (!strcmp(res->mode_value, "raw")) {
-#ifdef RTE_NET_I40E
-                       struct rte_pmd_i40e_flow_type_mapping
-                                       mapping[RTE_PMD_I40E_FLOW_TYPE_MAX];
-                       struct rte_pmd_i40e_pkt_template_conf conf;
-                       uint16_t flow_type = str2flowtype(res->flow_type);
-                       uint16_t i, port = res->port_id;
-                       uint8_t add;
-
-                       memset(&conf, 0, sizeof(conf));
-
-                       if (flow_type == RTE_ETH_FLOW_UNKNOWN) {
-                               printf("Invalid flow type specified.\n");
-                               return;
-                       }
-                       ret = rte_pmd_i40e_flow_type_mapping_get(res->port_id,
-                                                                mapping);
-                       if (ret)
-                               return;
-                       if (mapping[flow_type].pctype == 0ULL) {
-                               printf("Invalid flow type specified.\n");
-                               return;
-                       }
-                       for (i = 0; i < RTE_PMD_I40E_PCTYPE_MAX; i++) {
-                               if (mapping[flow_type].pctype & (1ULL << i)) {
-                                       conf.input.pctype = i;
-                                       break;
-                               }
-                       }
-
-                       conf.input.packet = open_file(res->filepath,
-                                               &conf.input.length);
-                       if (!conf.input.packet)
-                               return;
-                       if (!strcmp(res->drop, "drop"))
-                               conf.action.behavior =
-                                       RTE_PMD_I40E_PKT_TEMPLATE_REJECT;
-                       else
-                               conf.action.behavior =
-                                       RTE_PMD_I40E_PKT_TEMPLATE_ACCEPT;
-                       conf.action.report_status =
-                                       RTE_PMD_I40E_PKT_TEMPLATE_REPORT_ID;
-                       conf.action.rx_queue = res->queue_id;
-                       conf.soft_id = res->fd_id_value;
-                       add  = strcmp(res->ops, "del") ? 1 : 0;
-                       ret = rte_pmd_i40e_flow_add_del_packet_template(port,
-                                                                       &conf,
-                                                                       add);
-                       if (ret < 0)
-                               printf("flow director config error: (%s)\n",
-                                      strerror(-ret));
-                       close_file(conf.input.packet);
-#endif
-                       return;
-               } else if (strcmp(res->mode_value, "IP")) {
-                       printf("Please set mode to IP or raw.\n");
-                       return;
-               }
-               entry.input.flow_type = str2flowtype(res->flow_type);
-       }
+       memset(&conf, 0, sizeof(conf));
 
-       ret = parse_flexbytes(res->flexbytes_value,
-                                       flexbytes,
-                                       RTE_ETH_FDIR_MAX_FLEXLEN);
-       if (ret < 0) {
-               printf("error: Cannot parse flexbytes input.\n");
+       if (flow_type == RTE_ETH_FLOW_UNKNOWN) {
+               printf("Invalid flow type specified.\n");
                return;
        }
-
-       switch (entry.input.flow_type) {
-       case RTE_ETH_FLOW_FRAG_IPV4:
-       case RTE_ETH_FLOW_NONFRAG_IPV4_OTHER:
-               entry.input.flow.ip4_flow.proto = res->proto_value;
-               /* fall-through */
-       case RTE_ETH_FLOW_NONFRAG_IPV4_UDP:
-       case RTE_ETH_FLOW_NONFRAG_IPV4_TCP:
-               IPV4_ADDR_TO_UINT(res->ip_dst,
-                       entry.input.flow.ip4_flow.dst_ip);
-               IPV4_ADDR_TO_UINT(res->ip_src,
-                       entry.input.flow.ip4_flow.src_ip);
-               entry.input.flow.ip4_flow.tos = res->tos_value;
-               entry.input.flow.ip4_flow.ttl = res->ttl_value;
-               /* need convert to big endian. */
-               entry.input.flow.udp4_flow.dst_port =
-                               rte_cpu_to_be_16(res->port_dst);
-               entry.input.flow.udp4_flow.src_port =
-                               rte_cpu_to_be_16(res->port_src);
-               break;
-       case RTE_ETH_FLOW_NONFRAG_IPV4_SCTP:
-               IPV4_ADDR_TO_UINT(res->ip_dst,
-                       entry.input.flow.sctp4_flow.ip.dst_ip);
-               IPV4_ADDR_TO_UINT(res->ip_src,
-                       entry.input.flow.sctp4_flow.ip.src_ip);
-               entry.input.flow.ip4_flow.tos = res->tos_value;
-               entry.input.flow.ip4_flow.ttl = res->ttl_value;
-               /* need convert to big endian. */
-               entry.input.flow.sctp4_flow.dst_port =
-                               rte_cpu_to_be_16(res->port_dst);
-               entry.input.flow.sctp4_flow.src_port =
-                               rte_cpu_to_be_16(res->port_src);
-               entry.input.flow.sctp4_flow.verify_tag =
-                               rte_cpu_to_be_32(res->verify_tag_value);
-               break;
-       case RTE_ETH_FLOW_FRAG_IPV6:
-       case RTE_ETH_FLOW_NONFRAG_IPV6_OTHER:
-               entry.input.flow.ipv6_flow.proto = res->proto_value;
-               /* fall-through */
-       case RTE_ETH_FLOW_NONFRAG_IPV6_UDP:
-       case RTE_ETH_FLOW_NONFRAG_IPV6_TCP:
-               IPV6_ADDR_TO_ARRAY(res->ip_dst,
-                       entry.input.flow.ipv6_flow.dst_ip);
-               IPV6_ADDR_TO_ARRAY(res->ip_src,
-                       entry.input.flow.ipv6_flow.src_ip);
-               entry.input.flow.ipv6_flow.tc = res->tos_value;
-               entry.input.flow.ipv6_flow.hop_limits = res->ttl_value;
-               /* need convert to big endian. */
-               entry.input.flow.udp6_flow.dst_port =
-                               rte_cpu_to_be_16(res->port_dst);
-               entry.input.flow.udp6_flow.src_port =
-                               rte_cpu_to_be_16(res->port_src);
-               break;
-       case RTE_ETH_FLOW_NONFRAG_IPV6_SCTP:
-               IPV6_ADDR_TO_ARRAY(res->ip_dst,
-                       entry.input.flow.sctp6_flow.ip.dst_ip);
-               IPV6_ADDR_TO_ARRAY(res->ip_src,
-                       entry.input.flow.sctp6_flow.ip.src_ip);
-               entry.input.flow.ipv6_flow.tc = res->tos_value;
-               entry.input.flow.ipv6_flow.hop_limits = res->ttl_value;
-               /* need convert to big endian. */
-               entry.input.flow.sctp6_flow.dst_port =
-                               rte_cpu_to_be_16(res->port_dst);
-               entry.input.flow.sctp6_flow.src_port =
-                               rte_cpu_to_be_16(res->port_src);
-               entry.input.flow.sctp6_flow.verify_tag =
-                               rte_cpu_to_be_32(res->verify_tag_value);
-               break;
-       case RTE_ETH_FLOW_L2_PAYLOAD:
-               entry.input.flow.l2_flow.ether_type =
-                       rte_cpu_to_be_16(res->ether_type);
-               break;
-       default:
-               break;
-       }
-
-       if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_MAC_VLAN)
-               rte_memcpy(&entry.input.flow.mac_vlan_flow.mac_addr,
-                                &res->mac_addr,
-                                sizeof(struct rte_ether_addr));
-
-       if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_TUNNEL) {
-               rte_memcpy(&entry.input.flow.tunnel_flow.mac_addr,
-                                &res->mac_addr,
-                                sizeof(struct rte_ether_addr));
-               entry.input.flow.tunnel_flow.tunnel_type =
-                       str2fdir_tunneltype(res->tunnel_type);
-               entry.input.flow.tunnel_flow.tunnel_id =
-                       rte_cpu_to_be_32(res->tunnel_id_value);
+       ret = rte_pmd_i40e_flow_type_mapping_get(res->port_id,
+                                                mapping);
+       if (ret)
+               return;
+       if (mapping[flow_type].pctype == 0ULL) {
+               printf("Invalid flow type specified.\n");
+               return;
        }
-
-       rte_memcpy(entry.input.flow_ext.flexbytes,
-                  flexbytes,
-                  RTE_ETH_FDIR_MAX_FLEXLEN);
-
-       entry.input.flow_ext.vlan_tci = rte_cpu_to_be_16(res->vlan_value);
-
-       entry.action.flex_off = 0;  /*use 0 by default */
-       if (!strcmp(res->drop, "drop"))
-               entry.action.behavior = RTE_ETH_FDIR_REJECT;
-       else
-               entry.action.behavior = RTE_ETH_FDIR_ACCEPT;
-
-       if (fdir_conf.mode !=  RTE_FDIR_MODE_PERFECT_MAC_VLAN &&
-           fdir_conf.mode !=  RTE_FDIR_MODE_PERFECT_TUNNEL) {
-               if (!strcmp(res->pf_vf, "pf"))
-                       entry.input.flow_ext.is_vf = 0;
-               else if (!strncmp(res->pf_vf, "vf", 2)) {
-                       struct rte_eth_dev_info dev_info;
-
-                       ret = eth_dev_info_get_print_err(res->port_id,
-                                               &dev_info);
-                       if (ret != 0)
-                               return;
-
-                       errno = 0;
-                       vf_id = strtoul(res->pf_vf + 2, &end, 10);
-                       if (errno != 0 || *end != '\0' ||
-                           vf_id >= dev_info.max_vfs) {
-                               printf("invalid parameter %s.\n", res->pf_vf);
-                               return;
-                       }
-                       entry.input.flow_ext.is_vf = 1;
-                       entry.input.flow_ext.dst_id = (uint16_t)vf_id;
-               } else {
-                       printf("invalid parameter %s.\n", res->pf_vf);
-                       return;
+       for (i = 0; i < RTE_PMD_I40E_PCTYPE_MAX; i++) {
+               if (mapping[flow_type].pctype & (1ULL << i)) {
+                       conf.input.pctype = i;
+                       break;
                }
        }
 
-       /* set to report FD ID by default */
-       entry.action.report_status = RTE_ETH_FDIR_REPORT_ID;
-       entry.action.rx_queue = res->queue_id;
-       entry.soft_id = res->fd_id_value;
-       if (!strcmp(res->ops, "add"))
-               ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_FDIR,
-                                            RTE_ETH_FILTER_ADD, &entry);
-       else if (!strcmp(res->ops, "del"))
-               ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_FDIR,
-                                            RTE_ETH_FILTER_DELETE, &entry);
+       conf.input.packet = open_file(res->filepath,
+                               &conf.input.length);
+       if (!conf.input.packet)
+               return;
+       if (!strcmp(res->drop, "drop"))
+               conf.action.behavior =
+                       RTE_PMD_I40E_PKT_TEMPLATE_REJECT;
        else
-               ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_FDIR,
-                                            RTE_ETH_FILTER_UPDATE, &entry);
+               conf.action.behavior =
+                       RTE_PMD_I40E_PKT_TEMPLATE_ACCEPT;
+       conf.action.report_status =
+                       RTE_PMD_I40E_PKT_TEMPLATE_REPORT_ID;
+       conf.action.rx_queue = res->queue_id;
+       conf.soft_id = res->fd_id_value;
+       add  = strcmp(res->ops, "del") ? 1 : 0;
+       ret = rte_pmd_i40e_flow_add_del_packet_template(port,
+                                                       &conf,
+                                                       add);
        if (ret < 0)
-               printf("flow director programming error: (%s)\n",
-                       strerror(-ret));
+               printf("flow director config error: (%s)\n",
+                      strerror(-ret));
+       close_file(conf.input.packet);
 }
 
 cmdline_parse_token_string_t cmd_flow_director_filter =
@@ -10626,7 +10238,7 @@ cmdline_parse_token_string_t cmd_flow_director_filter =
                                 flow_director_filter, "flow_director_filter");
 cmdline_parse_token_num_t cmd_flow_director_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 ops, "add#del#update");
@@ -10636,118 +10248,28 @@ cmdline_parse_token_string_t cmd_flow_director_flow =
 cmdline_parse_token_string_t cmd_flow_director_flow_type =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                flow_type, NULL);
-cmdline_parse_token_string_t cmd_flow_director_ether =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                ether, "ether");
-cmdline_parse_token_num_t cmd_flow_director_ether_type =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             ether_type, UINT16);
-cmdline_parse_token_string_t cmd_flow_director_src =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                src, "src");
-cmdline_parse_token_ipaddr_t cmd_flow_director_ip_src =
-       TOKEN_IPADDR_INITIALIZER(struct cmd_flow_director_result,
-                                ip_src);
-cmdline_parse_token_num_t cmd_flow_director_port_src =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             port_src, UINT16);
-cmdline_parse_token_string_t cmd_flow_director_dst =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                dst, "dst");
-cmdline_parse_token_ipaddr_t cmd_flow_director_ip_dst =
-       TOKEN_IPADDR_INITIALIZER(struct cmd_flow_director_result,
-                                ip_dst);
-cmdline_parse_token_num_t cmd_flow_director_port_dst =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             port_dst, UINT16);
-cmdline_parse_token_string_t cmd_flow_director_verify_tag =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                 verify_tag, "verify_tag");
-cmdline_parse_token_num_t cmd_flow_director_verify_tag_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             verify_tag_value, UINT32);
-cmdline_parse_token_string_t cmd_flow_director_tos =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                tos, "tos");
-cmdline_parse_token_num_t cmd_flow_director_tos_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             tos_value, UINT8);
-cmdline_parse_token_string_t cmd_flow_director_proto =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                proto, "proto");
-cmdline_parse_token_num_t cmd_flow_director_proto_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             proto_value, UINT8);
-cmdline_parse_token_string_t cmd_flow_director_ttl =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                ttl, "ttl");
-cmdline_parse_token_num_t cmd_flow_director_ttl_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             ttl_value, UINT8);
-cmdline_parse_token_string_t cmd_flow_director_vlan =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                vlan, "vlan");
-cmdline_parse_token_num_t cmd_flow_director_vlan_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             vlan_value, UINT16);
-cmdline_parse_token_string_t cmd_flow_director_flexbytes =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                flexbytes, "flexbytes");
-cmdline_parse_token_string_t cmd_flow_director_flexbytes_value =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                             flexbytes_value, NULL);
 cmdline_parse_token_string_t cmd_flow_director_drop =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 drop, "drop#fwd");
-cmdline_parse_token_string_t cmd_flow_director_pf_vf =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                             pf_vf, NULL);
 cmdline_parse_token_string_t cmd_flow_director_queue =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 queue, "queue");
 cmdline_parse_token_num_t cmd_flow_director_queue_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             queue_id, UINT16);
+                             queue_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_fd_id =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 fd_id, "fd_id");
 cmdline_parse_token_num_t cmd_flow_director_fd_id_value =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             fd_id_value, UINT32);
+                             fd_id_value, RTE_UINT32);
 
 cmdline_parse_token_string_t cmd_flow_director_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 mode, "mode");
-cmdline_parse_token_string_t cmd_flow_director_mode_ip =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                mode_value, "IP");
-cmdline_parse_token_string_t cmd_flow_director_mode_mac_vlan =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                mode_value, "MAC-VLAN");
-cmdline_parse_token_string_t cmd_flow_director_mode_tunnel =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                mode_value, "Tunnel");
-cmdline_parse_token_string_t cmd_flow_director_mode_raw =
+cmdline_parse_token_string_t cmd_flow_director_mode_raw =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 mode_value, "raw");
-cmdline_parse_token_string_t cmd_flow_director_mac =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                mac, "mac");
-cmdline_parse_token_etheraddr_t cmd_flow_director_mac_addr =
-       TOKEN_ETHERADDR_INITIALIZER(struct cmd_flow_director_result,
-                                   mac_addr);
-cmdline_parse_token_string_t cmd_flow_director_tunnel =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                tunnel, "tunnel");
-cmdline_parse_token_string_t cmd_flow_director_tunnel_type =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                tunnel_type, "NVGRE#VxLAN");
-cmdline_parse_token_string_t cmd_flow_director_tunnel_id =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-                                tunnel_id, "tunnel-id");
-cmdline_parse_token_num_t cmd_flow_director_tunnel_id_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             tunnel_id_value, UINT32);
 cmdline_parse_token_string_t cmd_flow_director_packet =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 packet, "packet");
@@ -10755,208 +10277,6 @@ cmdline_parse_token_string_t cmd_flow_director_filepath =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 filepath, NULL);
 
-cmdline_parse_inst_t cmd_add_del_ip_flow_director = {
-       .f = cmd_flow_director_filter_parsed,
-       .data = NULL,
-       .help_str = "flow_director_filter <port_id> mode IP add|del|update flow"
-               " ipv4-other|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|"
-               "ipv6-other|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|"
-               "l2_payload src <src_ip> dst <dst_ip> tos <tos_value> "
-               "proto <proto_value> ttl <ttl_value> vlan <vlan_value> "
-               "flexbytes <flexbyte_values> drop|fw <pf_vf> queue <queue_id> "
-               "fd_id <fd_id_value>: "
-               "Add or delete an ip flow director entry on NIC",
-       .tokens = {
-               (void *)&cmd_flow_director_filter,
-               (void *)&cmd_flow_director_port_id,
-               (void *)&cmd_flow_director_mode,
-               (void *)&cmd_flow_director_mode_ip,
-               (void *)&cmd_flow_director_ops,
-               (void *)&cmd_flow_director_flow,
-               (void *)&cmd_flow_director_flow_type,
-               (void *)&cmd_flow_director_src,
-               (void *)&cmd_flow_director_ip_src,
-               (void *)&cmd_flow_director_dst,
-               (void *)&cmd_flow_director_ip_dst,
-               (void *)&cmd_flow_director_tos,
-               (void *)&cmd_flow_director_tos_value,
-               (void *)&cmd_flow_director_proto,
-               (void *)&cmd_flow_director_proto_value,
-               (void *)&cmd_flow_director_ttl,
-               (void *)&cmd_flow_director_ttl_value,
-               (void *)&cmd_flow_director_vlan,
-               (void *)&cmd_flow_director_vlan_value,
-               (void *)&cmd_flow_director_flexbytes,
-               (void *)&cmd_flow_director_flexbytes_value,
-               (void *)&cmd_flow_director_drop,
-               (void *)&cmd_flow_director_pf_vf,
-               (void *)&cmd_flow_director_queue,
-               (void *)&cmd_flow_director_queue_id,
-               (void *)&cmd_flow_director_fd_id,
-               (void *)&cmd_flow_director_fd_id_value,
-               NULL,
-       },
-};
-
-cmdline_parse_inst_t cmd_add_del_udp_flow_director = {
-       .f = cmd_flow_director_filter_parsed,
-       .data = NULL,
-       .help_str = "flow_director_filter ... : Add or delete an udp/tcp flow "
-               "director entry on NIC",
-       .tokens = {
-               (void *)&cmd_flow_director_filter,
-               (void *)&cmd_flow_director_port_id,
-               (void *)&cmd_flow_director_mode,
-               (void *)&cmd_flow_director_mode_ip,
-               (void *)&cmd_flow_director_ops,
-               (void *)&cmd_flow_director_flow,
-               (void *)&cmd_flow_director_flow_type,
-               (void *)&cmd_flow_director_src,
-               (void *)&cmd_flow_director_ip_src,
-               (void *)&cmd_flow_director_port_src,
-               (void *)&cmd_flow_director_dst,
-               (void *)&cmd_flow_director_ip_dst,
-               (void *)&cmd_flow_director_port_dst,
-               (void *)&cmd_flow_director_tos,
-               (void *)&cmd_flow_director_tos_value,
-               (void *)&cmd_flow_director_ttl,
-               (void *)&cmd_flow_director_ttl_value,
-               (void *)&cmd_flow_director_vlan,
-               (void *)&cmd_flow_director_vlan_value,
-               (void *)&cmd_flow_director_flexbytes,
-               (void *)&cmd_flow_director_flexbytes_value,
-               (void *)&cmd_flow_director_drop,
-               (void *)&cmd_flow_director_pf_vf,
-               (void *)&cmd_flow_director_queue,
-               (void *)&cmd_flow_director_queue_id,
-               (void *)&cmd_flow_director_fd_id,
-               (void *)&cmd_flow_director_fd_id_value,
-               NULL,
-       },
-};
-
-cmdline_parse_inst_t cmd_add_del_sctp_flow_director = {
-       .f = cmd_flow_director_filter_parsed,
-       .data = NULL,
-       .help_str = "flow_director_filter ... : Add or delete a sctp flow "
-               "director entry on NIC",
-       .tokens = {
-               (void *)&cmd_flow_director_filter,
-               (void *)&cmd_flow_director_port_id,
-               (void *)&cmd_flow_director_mode,
-               (void *)&cmd_flow_director_mode_ip,
-               (void *)&cmd_flow_director_ops,
-               (void *)&cmd_flow_director_flow,
-               (void *)&cmd_flow_director_flow_type,
-               (void *)&cmd_flow_director_src,
-               (void *)&cmd_flow_director_ip_src,
-               (void *)&cmd_flow_director_port_src,
-               (void *)&cmd_flow_director_dst,
-               (void *)&cmd_flow_director_ip_dst,
-               (void *)&cmd_flow_director_port_dst,
-               (void *)&cmd_flow_director_verify_tag,
-               (void *)&cmd_flow_director_verify_tag_value,
-               (void *)&cmd_flow_director_tos,
-               (void *)&cmd_flow_director_tos_value,
-               (void *)&cmd_flow_director_ttl,
-               (void *)&cmd_flow_director_ttl_value,
-               (void *)&cmd_flow_director_vlan,
-               (void *)&cmd_flow_director_vlan_value,
-               (void *)&cmd_flow_director_flexbytes,
-               (void *)&cmd_flow_director_flexbytes_value,
-               (void *)&cmd_flow_director_drop,
-               (void *)&cmd_flow_director_pf_vf,
-               (void *)&cmd_flow_director_queue,
-               (void *)&cmd_flow_director_queue_id,
-               (void *)&cmd_flow_director_fd_id,
-               (void *)&cmd_flow_director_fd_id_value,
-               NULL,
-       },
-};
-
-cmdline_parse_inst_t cmd_add_del_l2_flow_director = {
-       .f = cmd_flow_director_filter_parsed,
-       .data = NULL,
-       .help_str = "flow_director_filter ... : Add or delete a L2 flow "
-               "director entry on NIC",
-       .tokens = {
-               (void *)&cmd_flow_director_filter,
-               (void *)&cmd_flow_director_port_id,
-               (void *)&cmd_flow_director_mode,
-               (void *)&cmd_flow_director_mode_ip,
-               (void *)&cmd_flow_director_ops,
-               (void *)&cmd_flow_director_flow,
-               (void *)&cmd_flow_director_flow_type,
-               (void *)&cmd_flow_director_ether,
-               (void *)&cmd_flow_director_ether_type,
-               (void *)&cmd_flow_director_flexbytes,
-               (void *)&cmd_flow_director_flexbytes_value,
-               (void *)&cmd_flow_director_drop,
-               (void *)&cmd_flow_director_pf_vf,
-               (void *)&cmd_flow_director_queue,
-               (void *)&cmd_flow_director_queue_id,
-               (void *)&cmd_flow_director_fd_id,
-               (void *)&cmd_flow_director_fd_id_value,
-               NULL,
-       },
-};
-
-cmdline_parse_inst_t cmd_add_del_mac_vlan_flow_director = {
-       .f = cmd_flow_director_filter_parsed,
-       .data = NULL,
-       .help_str = "flow_director_filter ... : Add or delete a MAC VLAN flow "
-               "director entry on NIC",
-       .tokens = {
-               (void *)&cmd_flow_director_filter,
-               (void *)&cmd_flow_director_port_id,
-               (void *)&cmd_flow_director_mode,
-               (void *)&cmd_flow_director_mode_mac_vlan,
-               (void *)&cmd_flow_director_ops,
-               (void *)&cmd_flow_director_mac,
-               (void *)&cmd_flow_director_mac_addr,
-               (void *)&cmd_flow_director_vlan,
-               (void *)&cmd_flow_director_vlan_value,
-               (void *)&cmd_flow_director_flexbytes,
-               (void *)&cmd_flow_director_flexbytes_value,
-               (void *)&cmd_flow_director_drop,
-               (void *)&cmd_flow_director_queue,
-               (void *)&cmd_flow_director_queue_id,
-               (void *)&cmd_flow_director_fd_id,
-               (void *)&cmd_flow_director_fd_id_value,
-               NULL,
-       },
-};
-
-cmdline_parse_inst_t cmd_add_del_tunnel_flow_director = {
-       .f = cmd_flow_director_filter_parsed,
-       .data = NULL,
-       .help_str = "flow_director_filter ... : Add or delete a tunnel flow "
-               "director entry on NIC",
-       .tokens = {
-               (void *)&cmd_flow_director_filter,
-               (void *)&cmd_flow_director_port_id,
-               (void *)&cmd_flow_director_mode,
-               (void *)&cmd_flow_director_mode_tunnel,
-               (void *)&cmd_flow_director_ops,
-               (void *)&cmd_flow_director_mac,
-               (void *)&cmd_flow_director_mac_addr,
-               (void *)&cmd_flow_director_vlan,
-               (void *)&cmd_flow_director_vlan_value,
-               (void *)&cmd_flow_director_tunnel,
-               (void *)&cmd_flow_director_tunnel_type,
-               (void *)&cmd_flow_director_tunnel_id,
-               (void *)&cmd_flow_director_tunnel_id_value,
-               (void *)&cmd_flow_director_flexbytes,
-               (void *)&cmd_flow_director_flexbytes_value,
-               (void *)&cmd_flow_director_drop,
-               (void *)&cmd_flow_director_queue,
-               (void *)&cmd_flow_director_queue_id,
-               (void *)&cmd_flow_director_fd_id,
-               (void *)&cmd_flow_director_fd_id_value,
-               NULL,
-       },
-};
-
 cmdline_parse_inst_t cmd_add_del_raw_flow_director = {
        .f = cmd_flow_director_filter_parsed,
        .data = NULL,
@@ -10981,51 +10301,7 @@ cmdline_parse_inst_t cmd_add_del_raw_flow_director = {
        },
 };
 
-struct cmd_flush_flow_director_result {
-       cmdline_fixed_string_t flush_flow_director;
-       portid_t port_id;
-};
-
-cmdline_parse_token_string_t cmd_flush_flow_director_flush =
-       TOKEN_STRING_INITIALIZER(struct cmd_flush_flow_director_result,
-                                flush_flow_director, "flush_flow_director");
-cmdline_parse_token_num_t cmd_flush_flow_director_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_flush_flow_director_result,
-                             port_id, UINT16);
-
-static void
-cmd_flush_flow_director_parsed(void *parsed_result,
-                         __rte_unused struct cmdline *cl,
-                         __rte_unused void *data)
-{
-       struct cmd_flow_director_result *res = parsed_result;
-       int ret = 0;
-
-       ret = rte_eth_dev_filter_supported(res->port_id, RTE_ETH_FILTER_FDIR);
-       if (ret < 0) {
-               printf("flow director is not supported on port %u.\n",
-                       res->port_id);
-               return;
-       }
-
-       ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_FDIR,
-                       RTE_ETH_FILTER_FLUSH, NULL);
-       if (ret < 0)
-               printf("flow director table flushing error: (%s)\n",
-                       strerror(-ret));
-}
-
-cmdline_parse_inst_t cmd_flush_flow_director = {
-       .f = cmd_flush_flow_director_parsed,
-       .data = NULL,
-       .help_str = "flush_flow_director <port_id>: "
-               "Flush all flow director entries of a device on NIC",
-       .tokens = {
-               (void *)&cmd_flush_flow_director_flush,
-               (void *)&cmd_flush_flow_director_port_id,
-               NULL,
-       },
-};
+#endif /* RTE_NET_I40E */
 
 /* *** deal with flow director mask *** */
 struct cmd_flow_director_mask_result {
@@ -11109,13 +10385,13 @@ cmdline_parse_token_string_t cmd_flow_director_mask =
                                 flow_director_mask, "flow_director_mask");
 cmdline_parse_token_num_t cmd_flow_director_mask_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_vlan =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
                                 vlan, "vlan");
 cmdline_parse_token_num_t cmd_flow_director_mask_vlan_value =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-                             vlan_mask, UINT16);
+                             vlan_mask, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_src =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
                                 src_mask, "src_mask");
@@ -11127,7 +10403,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_src =
                                 ipv6_src);
 cmdline_parse_token_num_t cmd_flow_director_mask_port_src =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-                             port_src, UINT16);
+                             port_src, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_dst =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
                                 dst_mask, "dst_mask");
@@ -11139,7 +10415,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_dst =
                                 ipv6_dst);
 cmdline_parse_token_num_t cmd_flow_director_mask_port_dst =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-                             port_dst, UINT16);
+                             port_dst, RTE_UINT16);
 
 cmdline_parse_token_string_t cmd_flow_director_mask_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
@@ -11158,19 +10434,19 @@ cmdline_parse_token_string_t cmd_flow_director_mask_mac =
                                 mac, "mac");
 cmdline_parse_token_num_t cmd_flow_director_mask_mac_value =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-                             mac_addr_byte_mask, UINT8);
+                             mac_addr_byte_mask, RTE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_type =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
                                 tunnel_type, "tunnel-type");
 cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_type_value =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-                             tunnel_type_mask, UINT8);
+                             tunnel_type_mask, RTE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_id =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
                                 tunnel_id, "tunnel-id");
 cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_id_value =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-                             tunnel_id_mask, UINT32);
+                             tunnel_id_mask, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_set_flow_director_ip_mask = {
        .f = cmd_flow_director_mask_parsed,
@@ -11234,123 +10510,6 @@ cmdline_parse_inst_t cmd_set_flow_director_tunnel_mask = {
        },
 };
 
-/* *** deal with flow director mask on flexible payload *** */
-struct cmd_flow_director_flex_mask_result {
-       cmdline_fixed_string_t flow_director_flexmask;
-       portid_t port_id;
-       cmdline_fixed_string_t flow;
-       cmdline_fixed_string_t flow_type;
-       cmdline_fixed_string_t mask;
-};
-
-static void
-cmd_flow_director_flex_mask_parsed(void *parsed_result,
-                         __rte_unused struct cmdline *cl,
-                         __rte_unused void *data)
-{
-       struct cmd_flow_director_flex_mask_result *res = parsed_result;
-       struct rte_eth_fdir_info fdir_info;
-       struct rte_eth_fdir_flex_mask flex_mask;
-       struct rte_port *port;
-       uint64_t flow_type_mask;
-       uint16_t i;
-       int ret;
-
-       port = &ports[res->port_id];
-       /** Check if the port is not started **/
-       if (port->port_status != RTE_PORT_STOPPED) {
-               printf("Please stop port %d first\n", res->port_id);
-               return;
-       }
-
-       memset(&flex_mask, 0, sizeof(struct rte_eth_fdir_flex_mask));
-       ret = parse_flexbytes(res->mask,
-                       flex_mask.mask,
-                       RTE_ETH_FDIR_MAX_FLEXLEN);
-       if (ret < 0) {
-               printf("error: Cannot parse mask input.\n");
-               return;
-       }
-
-       memset(&fdir_info, 0, sizeof(fdir_info));
-       ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_FDIR,
-                               RTE_ETH_FILTER_INFO, &fdir_info);
-       if (ret < 0) {
-               printf("Cannot get FDir filter info\n");
-               return;
-       }
-
-       if (!strcmp(res->flow_type, "none")) {
-               /* means don't specify the flow type */
-               flex_mask.flow_type = RTE_ETH_FLOW_UNKNOWN;
-               for (i = 0; i < RTE_ETH_FLOW_MAX; i++)
-                       memset(&port->dev_conf.fdir_conf.flex_conf.flex_mask[i],
-                              0, sizeof(struct rte_eth_fdir_flex_mask));
-               port->dev_conf.fdir_conf.flex_conf.nb_flexmasks = 1;
-               rte_memcpy(&port->dev_conf.fdir_conf.flex_conf.flex_mask[0],
-                                &flex_mask,
-                                sizeof(struct rte_eth_fdir_flex_mask));
-               cmd_reconfig_device_queue(res->port_id, 1, 1);
-               return;
-       }
-       flow_type_mask = fdir_info.flow_types_mask[0];
-       if (!strcmp(res->flow_type, "all")) {
-               if (!flow_type_mask) {
-                       printf("No flow type supported\n");
-                       return;
-               }
-               for (i = RTE_ETH_FLOW_UNKNOWN; i < RTE_ETH_FLOW_MAX; i++) {
-                       if (flow_type_mask & (1ULL << i)) {
-                               flex_mask.flow_type = i;
-                               fdir_set_flex_mask(res->port_id, &flex_mask);
-                       }
-               }
-               cmd_reconfig_device_queue(res->port_id, 1, 1);
-               return;
-       }
-       flex_mask.flow_type = str2flowtype(res->flow_type);
-       if (!(flow_type_mask & (1ULL << flex_mask.flow_type))) {
-               printf("Flow type %s not supported on port %d\n",
-                               res->flow_type, res->port_id);
-               return;
-       }
-       fdir_set_flex_mask(res->port_id, &flex_mask);
-       cmd_reconfig_device_queue(res->port_id, 1, 1);
-}
-
-cmdline_parse_token_string_t cmd_flow_director_flexmask =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
-                                flow_director_flexmask,
-                                "flow_director_flex_mask");
-cmdline_parse_token_num_t cmd_flow_director_flexmask_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flex_mask_result,
-                             port_id, UINT16);
-cmdline_parse_token_string_t cmd_flow_director_flexmask_flow =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
-                                flow, "flow");
-cmdline_parse_token_string_t cmd_flow_director_flexmask_flow_type =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
-               flow_type, "none#ipv4-other#ipv4-frag#ipv4-tcp#ipv4-udp#ipv4-sctp#"
-               "ipv6-other#ipv6-frag#ipv6-tcp#ipv6-udp#ipv6-sctp#l2_payload#all");
-cmdline_parse_token_string_t cmd_flow_director_flexmask_mask =
-       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
-                                mask, NULL);
-
-cmdline_parse_inst_t cmd_set_flow_director_flex_mask = {
-       .f = cmd_flow_director_flex_mask_parsed,
-       .data = NULL,
-       .help_str = "flow_director_flex_mask ... : "
-               "Set flow director's flex mask on NIC",
-       .tokens = {
-               (void *)&cmd_flow_director_flexmask,
-               (void *)&cmd_flow_director_flexmask_port_id,
-               (void *)&cmd_flow_director_flexmask_flow,
-               (void *)&cmd_flow_director_flexmask_flow_type,
-               (void *)&cmd_flow_director_flexmask_mask,
-               NULL,
-       },
-};
-
 /* *** deal with flow director flexible payload configuration *** */
 struct cmd_flow_director_flexpayload_result {
        cmdline_fixed_string_t flow_director_flexpayload;
@@ -11442,7 +10601,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexpayload =
                                 "flow_director_flex_payload");
 cmdline_parse_token_num_t cmd_flow_director_flexpayload_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flexpayload_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_layer =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
                                 payload_layer, "raw#l2#l3#l4");
@@ -11467,132 +10626,6 @@ cmdline_parse_inst_t cmd_set_flow_director_flex_payload = {
 /* Generic flow interface command. */
 extern cmdline_parse_inst_t cmd_flow;
 
-/* *** Classification Filters Control *** */
-
-static enum rte_eth_input_set_field
-str2inset(char *string)
-{
-       uint16_t i;
-
-       static const struct {
-               char str[32];
-               enum rte_eth_input_set_field inset;
-       } inset_table[] = {
-               {"ethertype", RTE_ETH_INPUT_SET_L2_ETHERTYPE},
-               {"ovlan", RTE_ETH_INPUT_SET_L2_OUTER_VLAN},
-               {"ivlan", RTE_ETH_INPUT_SET_L2_INNER_VLAN},
-               {"src-ipv4", RTE_ETH_INPUT_SET_L3_SRC_IP4},
-               {"dst-ipv4", RTE_ETH_INPUT_SET_L3_DST_IP4},
-               {"ipv4-tos", RTE_ETH_INPUT_SET_L3_IP4_TOS},
-               {"ipv4-proto", RTE_ETH_INPUT_SET_L3_IP4_PROTO},
-               {"ipv4-ttl", RTE_ETH_INPUT_SET_L3_IP4_TTL},
-               {"src-ipv6", RTE_ETH_INPUT_SET_L3_SRC_IP6},
-               {"dst-ipv6", RTE_ETH_INPUT_SET_L3_DST_IP6},
-               {"ipv6-tc", RTE_ETH_INPUT_SET_L3_IP6_TC},
-               {"ipv6-next-header", RTE_ETH_INPUT_SET_L3_IP6_NEXT_HEADER},
-               {"ipv6-hop-limits", RTE_ETH_INPUT_SET_L3_IP6_HOP_LIMITS},
-               {"udp-src-port", RTE_ETH_INPUT_SET_L4_UDP_SRC_PORT},
-               {"udp-dst-port", RTE_ETH_INPUT_SET_L4_UDP_DST_PORT},
-               {"tcp-src-port", RTE_ETH_INPUT_SET_L4_TCP_SRC_PORT},
-               {"tcp-dst-port", RTE_ETH_INPUT_SET_L4_TCP_DST_PORT},
-               {"sctp-src-port", RTE_ETH_INPUT_SET_L4_SCTP_SRC_PORT},
-               {"sctp-dst-port", RTE_ETH_INPUT_SET_L4_SCTP_DST_PORT},
-               {"sctp-veri-tag", RTE_ETH_INPUT_SET_L4_SCTP_VERIFICATION_TAG},
-               {"udp-key", RTE_ETH_INPUT_SET_TUNNEL_L4_UDP_KEY},
-               {"gre-key", RTE_ETH_INPUT_SET_TUNNEL_GRE_KEY},
-               {"fld-1st", RTE_ETH_INPUT_SET_FLEX_PAYLOAD_1ST_WORD},
-               {"fld-2nd", RTE_ETH_INPUT_SET_FLEX_PAYLOAD_2ND_WORD},
-               {"fld-3rd", RTE_ETH_INPUT_SET_FLEX_PAYLOAD_3RD_WORD},
-               {"fld-4th", RTE_ETH_INPUT_SET_FLEX_PAYLOAD_4TH_WORD},
-               {"fld-5th", RTE_ETH_INPUT_SET_FLEX_PAYLOAD_5TH_WORD},
-               {"fld-6th", RTE_ETH_INPUT_SET_FLEX_PAYLOAD_6TH_WORD},
-               {"fld-7th", RTE_ETH_INPUT_SET_FLEX_PAYLOAD_7TH_WORD},
-               {"fld-8th", RTE_ETH_INPUT_SET_FLEX_PAYLOAD_8TH_WORD},
-               {"none", RTE_ETH_INPUT_SET_NONE},
-       };
-
-       for (i = 0; i < RTE_DIM(inset_table); i++) {
-               if (!strcmp(string, inset_table[i].str))
-                       return inset_table[i].inset;
-       }
-
-       return RTE_ETH_INPUT_SET_UNKNOWN;
-}
-
-/* Set flow director input set */
-struct cmd_set_fdir_input_set_result {
-       cmdline_fixed_string_t set_fdir_input_set;
-       portid_t port_id;
-       cmdline_fixed_string_t flow_type;
-       cmdline_fixed_string_t inset_field;
-       cmdline_fixed_string_t select;
-};
-
-static void
-cmd_set_fdir_input_set_parsed(void *parsed_result,
-       __rte_unused struct cmdline *cl,
-       __rte_unused void *data)
-{
-       struct cmd_set_fdir_input_set_result *res = parsed_result;
-       struct rte_eth_fdir_filter_info info;
-
-       memset(&info, 0, sizeof(info));
-       info.info_type = RTE_ETH_FDIR_FILTER_INPUT_SET_SELECT;
-       info.info.input_set_conf.flow_type = str2flowtype(res->flow_type);
-       info.info.input_set_conf.field[0] = str2inset(res->inset_field);
-       info.info.input_set_conf.inset_size = 1;
-       if (!strcmp(res->select, "select"))
-               info.info.input_set_conf.op = RTE_ETH_INPUT_SET_SELECT;
-       else if (!strcmp(res->select, "add"))
-               info.info.input_set_conf.op = RTE_ETH_INPUT_SET_ADD;
-       rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_FDIR,
-               RTE_ETH_FILTER_SET, &info);
-}
-
-cmdline_parse_token_string_t cmd_set_fdir_input_set_cmd =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
-       set_fdir_input_set, "set_fdir_input_set");
-cmdline_parse_token_num_t cmd_set_fdir_input_set_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_fdir_input_set_result,
-       port_id, UINT16);
-cmdline_parse_token_string_t cmd_set_fdir_input_set_flow_type =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
-       flow_type,
-       "ipv4-frag#ipv4-tcp#ipv4-udp#ipv4-sctp#ipv4-other#"
-       "ipv6-frag#ipv6-tcp#ipv6-udp#ipv6-sctp#ipv6-other#l2_payload");
-cmdline_parse_token_string_t cmd_set_fdir_input_set_field =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
-       inset_field,
-       "ivlan#ethertype#src-ipv4#dst-ipv4#src-ipv6#dst-ipv6#"
-       "ipv4-tos#ipv4-proto#ipv4-ttl#ipv6-tc#ipv6-next-header#"
-       "ipv6-hop-limits#udp-src-port#udp-dst-port#"
-       "tcp-src-port#tcp-dst-port#sctp-src-port#sctp-dst-port#"
-       "sctp-veri-tag#none");
-cmdline_parse_token_string_t cmd_set_fdir_input_set_select =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
-       select, "select#add");
-
-cmdline_parse_inst_t cmd_set_fdir_input_set = {
-       .f = cmd_set_fdir_input_set_parsed,
-       .data = NULL,
-       .help_str = "set_fdir_input_set <port_id> "
-       "ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
-       "ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|l2_payload "
-       "ivlan|ethertype|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|"
-       "ipv4-tos|ipv4-proto|ipv4-ttl|ipv6-tc|ipv6-next-header|"
-       "ipv6-hop-limits|udp-src-port|udp-dst-port|"
-       "tcp-src-port|tcp-dst-port|sctp-src-port|sctp-dst-port|"
-       "sctp-veri-tag|none select|add",
-       .tokens = {
-               (void *)&cmd_set_fdir_input_set_cmd,
-               (void *)&cmd_set_fdir_input_set_port_id,
-               (void *)&cmd_set_fdir_input_set_flow_type,
-               (void *)&cmd_set_fdir_input_set_field,
-               (void *)&cmd_set_fdir_input_set_select,
-               NULL,
-       },
-};
-
 /* *** ADD/REMOVE A MULTICAST MAC ADDRESS TO/FROM A PORT *** */
 struct cmd_mcast_addr_result {
        cmdline_fixed_string_t mcast_addr_cmd;
@@ -11627,7 +10660,8 @@ cmdline_parse_token_string_t cmd_mcast_addr_what =
        TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
                                 "add#remove");
 cmdline_parse_token_num_t cmd_mcast_addr_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num,
+                                RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_mcast_addr_addr =
        TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -11645,553 +10679,6 @@ cmdline_parse_inst_t cmd_mcast_addr = {
        },
 };
 
-/* l2 tunnel config
- * only support E-tag now.
- */
-
-/* Ether type config */
-struct cmd_config_l2_tunnel_eth_type_result {
-       cmdline_fixed_string_t port;
-       cmdline_fixed_string_t config;
-       cmdline_fixed_string_t all;
-       portid_t id;
-       cmdline_fixed_string_t l2_tunnel;
-       cmdline_fixed_string_t l2_tunnel_type;
-       cmdline_fixed_string_t eth_type;
-       uint16_t eth_type_val;
-};
-
-cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_port =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_eth_type_result,
-                port, "port");
-cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_config =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_eth_type_result,
-                config, "config");
-cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_all_str =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_eth_type_result,
-                all, "all");
-cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_id =
-       TOKEN_NUM_INITIALIZER
-               (struct cmd_config_l2_tunnel_eth_type_result,
-                id, UINT16);
-cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_l2_tunnel =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_eth_type_result,
-                l2_tunnel, "l2-tunnel");
-cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_l2_tunnel_type =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_eth_type_result,
-                l2_tunnel_type, "E-tag");
-cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_eth_type =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_eth_type_result,
-                eth_type, "ether-type");
-cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_eth_type_val =
-       TOKEN_NUM_INITIALIZER
-               (struct cmd_config_l2_tunnel_eth_type_result,
-                eth_type_val, UINT16);
-
-static enum rte_eth_tunnel_type
-str2fdir_l2_tunnel_type(char *string)
-{
-       uint32_t i = 0;
-
-       static const struct {
-               char str[32];
-               enum rte_eth_tunnel_type type;
-       } l2_tunnel_type_str[] = {
-               {"E-tag", RTE_L2_TUNNEL_TYPE_E_TAG},
-       };
-
-       for (i = 0; i < RTE_DIM(l2_tunnel_type_str); i++) {
-               if (!strcmp(l2_tunnel_type_str[i].str, string))
-                       return l2_tunnel_type_str[i].type;
-       }
-       return RTE_TUNNEL_TYPE_NONE;
-}
-
-/* ether type config for all ports */
-static void
-cmd_config_l2_tunnel_eth_type_all_parsed
-       (void *parsed_result,
-        __rte_unused struct cmdline *cl,
-        __rte_unused void *data)
-{
-       struct cmd_config_l2_tunnel_eth_type_result *res = parsed_result;
-       struct rte_eth_l2_tunnel_conf entry;
-       portid_t pid;
-
-       entry.l2_tunnel_type = str2fdir_l2_tunnel_type(res->l2_tunnel_type);
-       entry.ether_type = res->eth_type_val;
-
-       RTE_ETH_FOREACH_DEV(pid) {
-               rte_eth_dev_l2_tunnel_eth_type_conf(pid, &entry);
-       }
-}
-
-cmdline_parse_inst_t cmd_config_l2_tunnel_eth_type_all = {
-       .f = cmd_config_l2_tunnel_eth_type_all_parsed,
-       .data = NULL,
-       .help_str = "port config all l2-tunnel E-tag ether-type <value>",
-       .tokens = {
-               (void *)&cmd_config_l2_tunnel_eth_type_port,
-               (void *)&cmd_config_l2_tunnel_eth_type_config,
-               (void *)&cmd_config_l2_tunnel_eth_type_all_str,
-               (void *)&cmd_config_l2_tunnel_eth_type_l2_tunnel,
-               (void *)&cmd_config_l2_tunnel_eth_type_l2_tunnel_type,
-               (void *)&cmd_config_l2_tunnel_eth_type_eth_type,
-               (void *)&cmd_config_l2_tunnel_eth_type_eth_type_val,
-               NULL,
-       },
-};
-
-/* ether type config for a specific port */
-static void
-cmd_config_l2_tunnel_eth_type_specific_parsed(
-       void *parsed_result,
-       __rte_unused struct cmdline *cl,
-       __rte_unused void *data)
-{
-       struct cmd_config_l2_tunnel_eth_type_result *res =
-                parsed_result;
-       struct rte_eth_l2_tunnel_conf entry;
-
-       if (port_id_is_invalid(res->id, ENABLED_WARN))
-               return;
-
-       entry.l2_tunnel_type = str2fdir_l2_tunnel_type(res->l2_tunnel_type);
-       entry.ether_type = res->eth_type_val;
-
-       rte_eth_dev_l2_tunnel_eth_type_conf(res->id, &entry);
-}
-
-cmdline_parse_inst_t cmd_config_l2_tunnel_eth_type_specific = {
-       .f = cmd_config_l2_tunnel_eth_type_specific_parsed,
-       .data = NULL,
-       .help_str = "port config <port_id> l2-tunnel E-tag ether-type <value>",
-       .tokens = {
-               (void *)&cmd_config_l2_tunnel_eth_type_port,
-               (void *)&cmd_config_l2_tunnel_eth_type_config,
-               (void *)&cmd_config_l2_tunnel_eth_type_id,
-               (void *)&cmd_config_l2_tunnel_eth_type_l2_tunnel,
-               (void *)&cmd_config_l2_tunnel_eth_type_l2_tunnel_type,
-               (void *)&cmd_config_l2_tunnel_eth_type_eth_type,
-               (void *)&cmd_config_l2_tunnel_eth_type_eth_type_val,
-               NULL,
-       },
-};
-
-/* Enable/disable l2 tunnel */
-struct cmd_config_l2_tunnel_en_dis_result {
-       cmdline_fixed_string_t port;
-       cmdline_fixed_string_t config;
-       cmdline_fixed_string_t all;
-       portid_t id;
-       cmdline_fixed_string_t l2_tunnel;
-       cmdline_fixed_string_t l2_tunnel_type;
-       cmdline_fixed_string_t en_dis;
-};
-
-cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_port =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_en_dis_result,
-                port, "port");
-cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_config =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_en_dis_result,
-                config, "config");
-cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_all_str =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_en_dis_result,
-                all, "all");
-cmdline_parse_token_num_t cmd_config_l2_tunnel_en_dis_id =
-       TOKEN_NUM_INITIALIZER
-               (struct cmd_config_l2_tunnel_en_dis_result,
-                id, UINT16);
-cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_l2_tunnel =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_en_dis_result,
-                l2_tunnel, "l2-tunnel");
-cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_l2_tunnel_type =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_en_dis_result,
-                l2_tunnel_type, "E-tag");
-cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_en_dis =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_l2_tunnel_en_dis_result,
-                en_dis, "enable#disable");
-
-/* enable/disable l2 tunnel for all ports */
-static void
-cmd_config_l2_tunnel_en_dis_all_parsed(
-       void *parsed_result,
-       __rte_unused struct cmdline *cl,
-       __rte_unused void *data)
-{
-       struct cmd_config_l2_tunnel_en_dis_result *res = parsed_result;
-       struct rte_eth_l2_tunnel_conf entry;
-       portid_t pid;
-       uint8_t en;
-
-       entry.l2_tunnel_type = str2fdir_l2_tunnel_type(res->l2_tunnel_type);
-
-       if (!strcmp("enable", res->en_dis))
-               en = 1;
-       else
-               en = 0;
-
-       RTE_ETH_FOREACH_DEV(pid) {
-               rte_eth_dev_l2_tunnel_offload_set(pid,
-                                                 &entry,
-                                                 ETH_L2_TUNNEL_ENABLE_MASK,
-                                                 en);
-       }
-}
-
-cmdline_parse_inst_t cmd_config_l2_tunnel_en_dis_all = {
-       .f = cmd_config_l2_tunnel_en_dis_all_parsed,
-       .data = NULL,
-       .help_str = "port config all l2-tunnel E-tag enable|disable",
-       .tokens = {
-               (void *)&cmd_config_l2_tunnel_en_dis_port,
-               (void *)&cmd_config_l2_tunnel_en_dis_config,
-               (void *)&cmd_config_l2_tunnel_en_dis_all_str,
-               (void *)&cmd_config_l2_tunnel_en_dis_l2_tunnel,
-               (void *)&cmd_config_l2_tunnel_en_dis_l2_tunnel_type,
-               (void *)&cmd_config_l2_tunnel_en_dis_en_dis,
-               NULL,
-       },
-};
-
-/* enable/disable l2 tunnel for a port */
-static void
-cmd_config_l2_tunnel_en_dis_specific_parsed(
-       void *parsed_result,
-       __rte_unused struct cmdline *cl,
-       __rte_unused void *data)
-{
-       struct cmd_config_l2_tunnel_en_dis_result *res =
-               parsed_result;
-       struct rte_eth_l2_tunnel_conf entry;
-
-       if (port_id_is_invalid(res->id, ENABLED_WARN))
-               return;
-
-       entry.l2_tunnel_type = str2fdir_l2_tunnel_type(res->l2_tunnel_type);
-
-       if (!strcmp("enable", res->en_dis))
-               rte_eth_dev_l2_tunnel_offload_set(res->id,
-                                                 &entry,
-                                                 ETH_L2_TUNNEL_ENABLE_MASK,
-                                                 1);
-       else
-               rte_eth_dev_l2_tunnel_offload_set(res->id,
-                                                 &entry,
-                                                 ETH_L2_TUNNEL_ENABLE_MASK,
-                                                 0);
-}
-
-cmdline_parse_inst_t cmd_config_l2_tunnel_en_dis_specific = {
-       .f = cmd_config_l2_tunnel_en_dis_specific_parsed,
-       .data = NULL,
-       .help_str = "port config <port_id> l2-tunnel E-tag enable|disable",
-       .tokens = {
-               (void *)&cmd_config_l2_tunnel_en_dis_port,
-               (void *)&cmd_config_l2_tunnel_en_dis_config,
-               (void *)&cmd_config_l2_tunnel_en_dis_id,
-               (void *)&cmd_config_l2_tunnel_en_dis_l2_tunnel,
-               (void *)&cmd_config_l2_tunnel_en_dis_l2_tunnel_type,
-               (void *)&cmd_config_l2_tunnel_en_dis_en_dis,
-               NULL,
-       },
-};
-
-/* E-tag configuration */
-
-/* Common result structure for all E-tag configuration */
-struct cmd_config_e_tag_result {
-       cmdline_fixed_string_t e_tag;
-       cmdline_fixed_string_t set;
-       cmdline_fixed_string_t insertion;
-       cmdline_fixed_string_t stripping;
-       cmdline_fixed_string_t forwarding;
-       cmdline_fixed_string_t filter;
-       cmdline_fixed_string_t add;
-       cmdline_fixed_string_t del;
-       cmdline_fixed_string_t on;
-       cmdline_fixed_string_t off;
-       cmdline_fixed_string_t on_off;
-       cmdline_fixed_string_t port_tag_id;
-       uint32_t port_tag_id_val;
-       cmdline_fixed_string_t e_tag_id;
-       uint16_t e_tag_id_val;
-       cmdline_fixed_string_t dst_pool;
-       uint8_t dst_pool_val;
-       cmdline_fixed_string_t port;
-       portid_t port_id;
-       cmdline_fixed_string_t vf;
-       uint8_t vf_id;
-};
-
-/* Common CLI fields for all E-tag configuration */
-cmdline_parse_token_string_t cmd_config_e_tag_e_tag =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                e_tag, "E-tag");
-cmdline_parse_token_string_t cmd_config_e_tag_set =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                set, "set");
-cmdline_parse_token_string_t cmd_config_e_tag_insertion =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                insertion, "insertion");
-cmdline_parse_token_string_t cmd_config_e_tag_stripping =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                stripping, "stripping");
-cmdline_parse_token_string_t cmd_config_e_tag_forwarding =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                forwarding, "forwarding");
-cmdline_parse_token_string_t cmd_config_e_tag_filter =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                filter, "filter");
-cmdline_parse_token_string_t cmd_config_e_tag_add =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                add, "add");
-cmdline_parse_token_string_t cmd_config_e_tag_del =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                del, "del");
-cmdline_parse_token_string_t cmd_config_e_tag_on =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                on, "on");
-cmdline_parse_token_string_t cmd_config_e_tag_off =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                off, "off");
-cmdline_parse_token_string_t cmd_config_e_tag_on_off =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                on_off, "on#off");
-cmdline_parse_token_string_t cmd_config_e_tag_port_tag_id =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                port_tag_id, "port-tag-id");
-cmdline_parse_token_num_t cmd_config_e_tag_port_tag_id_val =
-       TOKEN_NUM_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                port_tag_id_val, UINT32);
-cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                e_tag_id, "e-tag-id");
-cmdline_parse_token_num_t cmd_config_e_tag_e_tag_id_val =
-       TOKEN_NUM_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                e_tag_id_val, UINT16);
-cmdline_parse_token_string_t cmd_config_e_tag_dst_pool =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                dst_pool, "dst-pool");
-cmdline_parse_token_num_t cmd_config_e_tag_dst_pool_val =
-       TOKEN_NUM_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                dst_pool_val, UINT8);
-cmdline_parse_token_string_t cmd_config_e_tag_port =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                port, "port");
-cmdline_parse_token_num_t cmd_config_e_tag_port_id =
-       TOKEN_NUM_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                port_id, UINT16);
-cmdline_parse_token_string_t cmd_config_e_tag_vf =
-       TOKEN_STRING_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                vf, "vf");
-cmdline_parse_token_num_t cmd_config_e_tag_vf_id =
-       TOKEN_NUM_INITIALIZER
-               (struct cmd_config_e_tag_result,
-                vf_id, UINT8);
-
-/* E-tag insertion configuration */
-static void
-cmd_config_e_tag_insertion_en_parsed(
-       void *parsed_result,
-       __rte_unused struct cmdline *cl,
-       __rte_unused void *data)
-{
-       struct cmd_config_e_tag_result *res =
-               parsed_result;
-       struct rte_eth_l2_tunnel_conf entry;
-
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
-               return;
-
-       entry.l2_tunnel_type = RTE_L2_TUNNEL_TYPE_E_TAG;
-       entry.tunnel_id = res->port_tag_id_val;
-       entry.vf_id = res->vf_id;
-       rte_eth_dev_l2_tunnel_offload_set(res->port_id,
-                                         &entry,
-                                         ETH_L2_TUNNEL_INSERTION_MASK,
-                                         1);
-}
-
-static void
-cmd_config_e_tag_insertion_dis_parsed(
-       void *parsed_result,
-       __rte_unused struct cmdline *cl,
-       __rte_unused void *data)
-{
-       struct cmd_config_e_tag_result *res =
-               parsed_result;
-       struct rte_eth_l2_tunnel_conf entry;
-
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
-               return;
-
-       entry.l2_tunnel_type = RTE_L2_TUNNEL_TYPE_E_TAG;
-       entry.vf_id = res->vf_id;
-
-       rte_eth_dev_l2_tunnel_offload_set(res->port_id,
-                                         &entry,
-                                         ETH_L2_TUNNEL_INSERTION_MASK,
-                                         0);
-}
-
-cmdline_parse_inst_t cmd_config_e_tag_insertion_en = {
-       .f = cmd_config_e_tag_insertion_en_parsed,
-       .data = NULL,
-       .help_str = "E-tag ... : E-tag insertion enable",
-       .tokens = {
-               (void *)&cmd_config_e_tag_e_tag,
-               (void *)&cmd_config_e_tag_set,
-               (void *)&cmd_config_e_tag_insertion,
-               (void *)&cmd_config_e_tag_on,
-               (void *)&cmd_config_e_tag_port_tag_id,
-               (void *)&cmd_config_e_tag_port_tag_id_val,
-               (void *)&cmd_config_e_tag_port,
-               (void *)&cmd_config_e_tag_port_id,
-               (void *)&cmd_config_e_tag_vf,
-               (void *)&cmd_config_e_tag_vf_id,
-               NULL,
-       },
-};
-
-cmdline_parse_inst_t cmd_config_e_tag_insertion_dis = {
-       .f = cmd_config_e_tag_insertion_dis_parsed,
-       .data = NULL,
-       .help_str = "E-tag ... : E-tag insertion disable",
-       .tokens = {
-               (void *)&cmd_config_e_tag_e_tag,
-               (void *)&cmd_config_e_tag_set,
-               (void *)&cmd_config_e_tag_insertion,
-               (void *)&cmd_config_e_tag_off,
-               (void *)&cmd_config_e_tag_port,
-               (void *)&cmd_config_e_tag_port_id,
-               (void *)&cmd_config_e_tag_vf,
-               (void *)&cmd_config_e_tag_vf_id,
-               NULL,
-       },
-};
-
-/* E-tag stripping configuration */
-static void
-cmd_config_e_tag_stripping_parsed(
-       void *parsed_result,
-       __rte_unused struct cmdline *cl,
-       __rte_unused void *data)
-{
-       struct cmd_config_e_tag_result *res =
-               parsed_result;
-       struct rte_eth_l2_tunnel_conf entry;
-
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
-               return;
-
-       entry.l2_tunnel_type = RTE_L2_TUNNEL_TYPE_E_TAG;
-
-       if (!strcmp(res->on_off, "on"))
-               rte_eth_dev_l2_tunnel_offload_set
-                       (res->port_id,
-                        &entry,
-                        ETH_L2_TUNNEL_STRIPPING_MASK,
-                        1);
-       else
-               rte_eth_dev_l2_tunnel_offload_set
-                       (res->port_id,
-                        &entry,
-                        ETH_L2_TUNNEL_STRIPPING_MASK,
-                        0);
-}
-
-cmdline_parse_inst_t cmd_config_e_tag_stripping_en_dis = {
-       .f = cmd_config_e_tag_stripping_parsed,
-       .data = NULL,
-       .help_str = "E-tag ... : E-tag stripping enable/disable",
-       .tokens = {
-               (void *)&cmd_config_e_tag_e_tag,
-               (void *)&cmd_config_e_tag_set,
-               (void *)&cmd_config_e_tag_stripping,
-               (void *)&cmd_config_e_tag_on_off,
-               (void *)&cmd_config_e_tag_port,
-               (void *)&cmd_config_e_tag_port_id,
-               NULL,
-       },
-};
-
-/* E-tag forwarding configuration */
-static void
-cmd_config_e_tag_forwarding_parsed(
-       void *parsed_result,
-       __rte_unused struct cmdline *cl,
-       __rte_unused void *data)
-{
-       struct cmd_config_e_tag_result *res = parsed_result;
-       struct rte_eth_l2_tunnel_conf entry;
-
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
-               return;
-
-       entry.l2_tunnel_type = RTE_L2_TUNNEL_TYPE_E_TAG;
-
-       if (!strcmp(res->on_off, "on"))
-               rte_eth_dev_l2_tunnel_offload_set
-                       (res->port_id,
-                        &entry,
-                        ETH_L2_TUNNEL_FORWARDING_MASK,
-                        1);
-       else
-               rte_eth_dev_l2_tunnel_offload_set
-                       (res->port_id,
-                        &entry,
-                        ETH_L2_TUNNEL_FORWARDING_MASK,
-                        0);
-}
-
-cmdline_parse_inst_t cmd_config_e_tag_forwarding_en_dis = {
-       .f = cmd_config_e_tag_forwarding_parsed,
-       .data = NULL,
-       .help_str = "E-tag ... : E-tag forwarding enable/disable",
-       .tokens = {
-               (void *)&cmd_config_e_tag_e_tag,
-               (void *)&cmd_config_e_tag_set,
-               (void *)&cmd_config_e_tag_forwarding,
-               (void *)&cmd_config_e_tag_on_off,
-               (void *)&cmd_config_e_tag_port,
-               (void *)&cmd_config_e_tag_port_id,
-               NULL,
-       },
-};
-
 /* vf vlan anti spoof configuration */
 
 /* Common result structure for vf vlan anti spoof */
@@ -12225,11 +10712,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_anti_spoof_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_anti_spoof_result,
-                vf_id, UINT32);
+                vf_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_vf_vlan_anti_spoof_result,
@@ -12331,11 +10818,11 @@ cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_mac_anti_spoof_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_mac_anti_spoof_result,
-                vf_id, UINT32);
+                vf_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_vf_mac_anti_spoof_result,
@@ -12437,11 +10924,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_stripq_stripq =
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_stripq_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_stripq_result,
-                vf_id, UINT16);
+                vf_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_vlan_stripq_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_vf_vlan_stripq_result,
@@ -12543,15 +11030,15 @@ cmdline_parse_token_string_t cmd_vf_vlan_insert_insert =
 cmdline_parse_token_num_t cmd_vf_vlan_insert_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_insert_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_insert_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_insert_result,
-                vf_id, UINT16);
+                vf_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_insert_vlan_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_insert_result,
-                vlan_id, UINT16);
+                vlan_id, RTE_UINT16);
 
 static void
 cmd_set_vf_vlan_insert_parsed(
@@ -12641,7 +11128,7 @@ cmdline_parse_token_string_t cmd_tx_loopback_loopback =
 cmdline_parse_token_num_t cmd_tx_loopback_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_tx_loopback_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_tx_loopback_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_tx_loopback_result,
@@ -12741,7 +11228,7 @@ cmdline_parse_token_string_t cmd_all_queues_drop_en_drop =
 cmdline_parse_token_num_t cmd_all_queues_drop_en_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_all_queues_drop_en_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_all_queues_drop_en_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_all_queues_drop_en_result,
@@ -12833,11 +11320,11 @@ cmdline_parse_token_string_t cmd_vf_split_drop_en_drop =
 cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_split_drop_en_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_split_drop_en_result,
-                vf_id, UINT16);
+                vf_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_split_drop_en_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_vf_split_drop_en_result,
@@ -12927,11 +11414,11 @@ cmdline_parse_token_string_t cmd_set_vf_mac_addr_addr =
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_mac_addr_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_mac_addr_result,
-                vf_id, UINT16);
+                vf_id, RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_vf_mac_addr_mac_addr =
        TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_mac_addr_result,
                 mac_addr);
@@ -13028,7 +11515,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_on_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_offload_on_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_on_on =
        TOKEN_STRING_INITIALIZER
                (struct cmd_macsec_offload_on_result,
@@ -13143,7 +11630,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_off_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_off_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_offload_off_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_off_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_macsec_offload_off_result,
@@ -13238,7 +11725,7 @@ cmdline_parse_token_string_t cmd_macsec_sc_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sc_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_sc_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
        TOKEN_ETHERADDR_INITIALIZER
                (struct cmd_macsec_sc_result,
@@ -13246,7 +11733,7 @@ cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
 cmdline_parse_token_num_t cmd_macsec_sc_pi =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_sc_result,
-                pi, UINT16);
+                pi, RTE_UINT16);
 
 static void
 cmd_set_macsec_sc_parsed(
@@ -13330,19 +11817,19 @@ cmdline_parse_token_string_t cmd_macsec_sa_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sa_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_sa_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_macsec_sa_idx =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_sa_result,
-                idx, UINT8);
+                idx, RTE_UINT8);
 cmdline_parse_token_num_t cmd_macsec_sa_an =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_sa_result,
-                an, UINT8);
+                an, RTE_UINT8);
 cmdline_parse_token_num_t cmd_macsec_sa_pn =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_sa_result,
-                pn, UINT32);
+                pn, RTE_UINT32);
 cmdline_parse_token_string_t cmd_macsec_sa_key =
        TOKEN_STRING_INITIALIZER
                (struct cmd_macsec_sa_result,
@@ -13450,11 +11937,11 @@ cmdline_parse_token_string_t cmd_vf_promisc_promisc =
 cmdline_parse_token_num_t cmd_vf_promisc_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_promisc_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_promisc_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_promisc_result,
-                vf_id, UINT32);
+                vf_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_promisc_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_vf_promisc_result,
@@ -13540,11 +12027,11 @@ cmdline_parse_token_string_t cmd_vf_allmulti_allmulti =
 cmdline_parse_token_num_t cmd_vf_allmulti_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_allmulti_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_allmulti_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_allmulti_result,
-                vf_id, UINT32);
+                vf_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_allmulti_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_vf_allmulti_result,
@@ -13630,11 +12117,11 @@ cmdline_parse_token_string_t cmd_set_vf_broadcast_broadcast =
 cmdline_parse_token_num_t cmd_set_vf_broadcast_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_broadcast_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_broadcast_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_broadcast_result,
-                vf_id, UINT16);
+                vf_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_broadcast_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_set_vf_broadcast_result,
@@ -13724,11 +12211,11 @@ cmdline_parse_token_string_t cmd_set_vf_vlan_tag_tag =
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_vlan_tag_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_vlan_tag_result,
-                vf_id, UINT16);
+                vf_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_vlan_tag_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_set_vf_vlan_tag_result,
@@ -13834,19 +12321,19 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_max_bw =
 cmdline_parse_token_num_t cmd_vf_tc_bw_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_tc_bw_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_tc_bw_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_tc_bw_result,
-                vf_id, UINT16);
+                vf_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_tc_bw_tc_no =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_tc_bw_result,
-                tc_no, UINT8);
+                tc_no, RTE_UINT8);
 cmdline_parse_token_num_t cmd_vf_tc_bw_bw =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_tc_bw_result,
-                bw, UINT32);
+                bw, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
        TOKEN_STRING_INITIALIZER
                (struct cmd_vf_tc_bw_result,
@@ -13854,7 +12341,7 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
 cmdline_parse_token_num_t cmd_vf_tc_bw_tc_map =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_tc_bw_result,
-                tc_map, UINT8);
+                tc_map, RTE_UINT8);
 
 /* VF max bandwidth setting */
 static void
@@ -14165,27 +12652,27 @@ cmdline_parse_token_string_t cmd_set_vxlan_vni =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
                                 "vni");
 cmdline_parse_token_num_t cmd_set_vxlan_vni_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_vxlan_udp_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
                                 "udp-src");
 cmdline_parse_token_num_t cmd_set_vxlan_udp_src_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_udp_dst =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
                                 "udp-dst");
 cmdline_parse_token_num_t cmd_set_vxlan_udp_dst_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_tos =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
                                 "ip-tos");
 cmdline_parse_token_num_t cmd_set_vxlan_ip_tos_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, RTE_UINT8);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_ttl =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
                                 "ip-ttl");
 cmdline_parse_token_num_t cmd_set_vxlan_ip_ttl_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, RTE_UINT8);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
                                 "ip-src");
@@ -14200,7 +12687,7 @@ cmdline_parse_token_string_t cmd_set_vxlan_vlan =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
                                 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_vxlan_vlan_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_eth_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
                                 "eth-src");
@@ -14385,7 +12872,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_tni =
        TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
                                 "tni");
 cmdline_parse_token_num_t cmd_set_nvgre_tni_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, UINT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_nvgre_ip_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
                                 "ip-src");
@@ -14400,7 +12887,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_vlan =
        TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
                                 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_nvgre_vlan_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_nvgre_eth_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
                                 "eth-src");
@@ -14531,7 +13018,7 @@ cmdline_parse_token_string_t cmd_set_l2_encap_vlan =
        TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
                                 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_l2_encap_vlan_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_l2_encap_eth_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
                                 "eth-src");
@@ -14691,7 +13178,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_label =
                                 pos_token, "label");
 cmdline_parse_token_num_t cmd_set_mplsogre_encap_label_value =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, label,
-                             UINT32);
+                             RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
                                 pos_token, "ip-src");
@@ -14707,7 +13194,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_vlan =
                                 pos_token, "vlan-tci");
 cmdline_parse_token_num_t cmd_set_mplsogre_encap_vlan_value =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, tci,
-                             UINT16);
+                             RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsogre_encap_eth_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
                                 pos_token, "eth-src");
@@ -14915,19 +13402,19 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_label =
                                 pos_token, "label");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_label_value =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, label,
-                             UINT32);
+                             RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
                                 pos_token, "udp-src");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_src_value =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_src,
-                             UINT16);
+                             RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_dst =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
                                 pos_token, "udp-dst");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_dst_value =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_dst,
-                             UINT16);
+                             RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
                                 pos_token, "ip-src");
@@ -14943,7 +13430,7 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_vlan =
                                 pos_token, "vlan-tci");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_vlan_value =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, tci,
-                             UINT16);
+                             RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_eth_src =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
                                 pos_token, "eth-src");
@@ -15186,7 +13673,8 @@ cmdline_parse_token_string_t cmd_ddp_add_ddp =
 cmdline_parse_token_string_t cmd_ddp_add_add =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, add, "add");
 cmdline_parse_token_num_t cmd_ddp_add_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id,
+               RTE_UINT16);
 cmdline_parse_token_string_t cmd_ddp_add_filepath =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, filepath, NULL);
 
@@ -15266,7 +13754,7 @@ cmdline_parse_token_string_t cmd_ddp_del_ddp =
 cmdline_parse_token_string_t cmd_ddp_del_del =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, del, "del");
 cmdline_parse_token_num_t cmd_ddp_del_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_ddp_del_filepath =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, filepath, NULL);
 
@@ -15573,7 +14061,8 @@ cmdline_parse_token_string_t cmd_ddp_get_list_get =
 cmdline_parse_token_string_t cmd_ddp_get_list_list =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, list, "list");
 cmdline_parse_token_num_t cmd_ddp_get_list_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, UINT16);
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id,
+               RTE_UINT16);
 
 static void
 cmd_ddp_get_list_parsed(
@@ -15724,13 +14213,13 @@ cmdline_parse_token_string_t cmd_cfg_input_set_cfg =
                                 cfg, "config");
 cmdline_parse_token_num_t cmd_cfg_input_set_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_cfg_input_set_pctype =
        TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
                                 pctype, "pctype");
 cmdline_parse_token_num_t cmd_cfg_input_set_pctype_id =
        TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-                             pctype_id, UINT8);
+                             pctype_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_cfg_input_set_inset_type =
        TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
                                 inset_type,
@@ -15743,7 +14232,7 @@ cmdline_parse_token_string_t cmd_cfg_input_set_field =
                                 field, "field");
 cmdline_parse_token_num_t cmd_cfg_input_set_field_idx =
        TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-                             field_idx, UINT8);
+                             field_idx, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_cfg_input_set = {
        .f = cmd_cfg_input_set_parsed,
@@ -15825,13 +14314,13 @@ cmdline_parse_token_string_t cmd_clear_input_set_cfg =
                                 cfg, "config");
 cmdline_parse_token_num_t cmd_clear_input_set_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_clear_input_set_pctype =
        TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
                                 pctype, "pctype");
 cmdline_parse_token_num_t cmd_clear_input_set_pctype_id =
        TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
-                             pctype_id, UINT8);
+                             pctype_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_clear_input_set_inset_type =
        TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
                                 inset_type,
@@ -15888,11 +14377,11 @@ cmdline_parse_token_string_t cmd_show_vf_stats_stats =
 cmdline_parse_token_num_t cmd_show_vf_stats_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_show_vf_stats_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_show_vf_stats_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_show_vf_stats_result,
-                vf_id, UINT16);
+                vf_id, RTE_UINT16);
 
 static void
 cmd_show_vf_stats_parsed(
@@ -15997,11 +14486,11 @@ cmdline_parse_token_string_t cmd_clear_vf_stats_stats =
 cmdline_parse_token_num_t cmd_clear_vf_stats_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_clear_vf_stats_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_clear_vf_stats_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_clear_vf_stats_result,
-                vf_id, UINT16);
+                vf_id, RTE_UINT16);
 
 static void
 cmd_clear_vf_stats_parsed(
@@ -16081,7 +14570,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_reset_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_reset_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_pctype_mapping_reset_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_reset_pctype =
        TOKEN_STRING_INITIALIZER
                (struct cmd_pctype_mapping_reset_result,
@@ -16163,7 +14652,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_get_port =
 cmdline_parse_token_num_t cmd_pctype_mapping_get_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_pctype_mapping_get_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_get_pctype =
        TOKEN_STRING_INITIALIZER
                (struct cmd_pctype_mapping_get_result,
@@ -16267,7 +14756,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_update_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_pctype_mapping_update_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_update_pctype =
        TOKEN_STRING_INITIALIZER
                (struct cmd_pctype_mapping_update_result,
@@ -16287,7 +14776,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_pc_type =
 cmdline_parse_token_num_t cmd_pctype_mapping_update_flow_type =
        TOKEN_NUM_INITIALIZER
                (struct cmd_pctype_mapping_update_result,
-                flow_type, UINT16);
+                flow_type, RTE_UINT16);
 
 static void
 cmd_pctype_mapping_update_parsed(
@@ -16381,11 +14870,11 @@ cmdline_parse_token_string_t cmd_ptype_mapping_get_get =
 cmdline_parse_token_num_t cmd_ptype_mapping_get_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_get_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_get_valid_only =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_get_result,
-                valid_only, UINT8);
+                valid_only, RTE_UINT8);
 
 static void
 cmd_ptype_mapping_get_parsed(
@@ -16478,19 +14967,19 @@ cmdline_parse_token_string_t cmd_ptype_mapping_replace_replace =
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_replace_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_target =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_replace_result,
-                target, UINT32);
+                target, RTE_UINT32);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_mask =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_replace_result,
-                mask, UINT8);
+                mask, RTE_UINT8);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_pkt_type =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_replace_result,
-                pkt_type, UINT32);
+                pkt_type, RTE_UINT32);
 
 static void
 cmd_ptype_mapping_replace_parsed(
@@ -16572,7 +15061,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_reset_reset =
 cmdline_parse_token_num_t cmd_ptype_mapping_reset_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_reset_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 
 static void
 cmd_ptype_mapping_reset_parsed(
@@ -16645,15 +15134,15 @@ cmdline_parse_token_string_t cmd_ptype_mapping_update_update =
 cmdline_parse_token_num_t cmd_ptype_mapping_update_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_update_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_update_hw_ptype =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_update_result,
-                hw_ptype, UINT8);
+                hw_ptype, RTE_UINT8);
 cmdline_parse_token_num_t cmd_ptype_mapping_update_sw_ptype =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_update_result,
-                sw_ptype, UINT32);
+                sw_ptype, RTE_UINT32);
 
 static void
 cmd_ptype_mapping_update_parsed(
@@ -16764,7 +15253,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_capa_port =
 cmdline_parse_token_num_t cmd_rx_offload_get_capa_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_rx_offload_get_capa_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_rx_offload_get_capa_rx_offload =
        TOKEN_STRING_INITIALIZER
                (struct cmd_rx_offload_get_capa_result,
@@ -16861,7 +15350,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_configuration_port =
 cmdline_parse_token_num_t cmd_rx_offload_get_configuration_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_rx_offload_get_configuration_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_rx_offload_get_configuration_rx_offload =
        TOKEN_STRING_INITIALIZER
                (struct cmd_rx_offload_get_configuration_result,
@@ -16943,7 +15432,7 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_config =
 cmdline_parse_token_num_t cmd_config_per_port_rx_offload_result_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_config_per_port_rx_offload_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_rx_offload =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_per_port_rx_offload_result,
@@ -17066,7 +15555,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_port =
 cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_config_per_queue_rx_offload_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_per_queue_rx_offload_result,
@@ -17074,7 +15563,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
 cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_queue_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_config_per_queue_rx_offload_result,
-                queue_id, UINT16);
+                queue_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxoffload =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_per_queue_rx_offload_result,
@@ -17175,7 +15664,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_capa_port =
 cmdline_parse_token_num_t cmd_tx_offload_get_capa_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_tx_offload_get_capa_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_tx_offload_get_capa_tx_offload =
        TOKEN_STRING_INITIALIZER
                (struct cmd_tx_offload_get_capa_result,
@@ -17272,7 +15761,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_configuration_port =
 cmdline_parse_token_num_t cmd_tx_offload_get_configuration_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_tx_offload_get_configuration_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_tx_offload_get_configuration_tx_offload =
        TOKEN_STRING_INITIALIZER
                (struct cmd_tx_offload_get_configuration_result,
@@ -17354,7 +15843,7 @@ cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_config =
 cmdline_parse_token_num_t cmd_config_per_port_tx_offload_result_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_config_per_port_tx_offload_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_tx_offload =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_per_port_tx_offload_result,
@@ -17483,7 +15972,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_port =
 cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_config_per_queue_tx_offload_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_per_queue_tx_offload_result,
@@ -17491,7 +15980,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
 cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_queue_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_config_per_queue_tx_offload_result,
-                queue_id, UINT16);
+                queue_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txoffload =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_per_queue_tx_offload_result,
@@ -17609,13 +16098,13 @@ cmdline_parse_token_string_t cmd_config_tx_metadata_specific_keyword =
                        keyword, "config");
 cmdline_parse_token_num_t cmd_config_tx_metadata_specific_id =
        TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
-                       port_id, UINT16);
+                       port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_tx_metadata_specific_item =
        TOKEN_STRING_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
                        item, "tx_metadata");
 cmdline_parse_token_num_t cmd_config_tx_metadata_specific_value =
        TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
-                       value, UINT32);
+                       value, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_tx_metadata_specific = {
        .f = cmd_config_tx_metadata_specific_parsed,
@@ -17688,7 +16177,7 @@ cmdline_parse_token_string_t cmd_config_tx_dynf_specific_keyword =
                        keyword, "config");
 cmdline_parse_token_num_t cmd_config_tx_dynf_specific_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
-                       port_id, UINT16);
+                       port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_tx_dynf_specific_item =
        TOKEN_STRING_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
                        item, "dynf");
@@ -17747,7 +16236,7 @@ cmdline_parse_token_string_t cmd_show_tx_metadata_port =
                        cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_tx_metadata_pid =
        TOKEN_NUM_INITIALIZER(struct cmd_show_tx_metadata_result,
-                       cmd_pid, UINT16);
+                       cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_tx_metadata_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_show_tx_metadata_result,
                        cmd_keyword, "tx_metadata");
@@ -17812,7 +16301,7 @@ cmdline_parse_token_string_t cmd_show_fec_capability_port =
                        cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_fec_capability_pid =
        TOKEN_NUM_INITIALIZER(struct cmd_show_fec_capability_result,
-                       cmd_pid, UINT16);
+                       cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_fec_capability_fec =
        TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
                        cmd_fec, "fec");
@@ -17894,7 +16383,7 @@ cmdline_parse_token_string_t cmd_show_fec_mode_port =
                        cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_fec_mode_pid =
        TOKEN_NUM_INITIALIZER(struct cmd_show_fec_metadata_result,
-                       cmd_pid, UINT16);
+                       cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_fec_mode_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_show_fec_metadata_result,
                        cmd_keyword, "fec_mode");
@@ -17933,7 +16422,7 @@ cmdline_parse_token_string_t cmd_set_port_fec_mode_port =
 cmdline_parse_token_num_t cmd_set_port_fec_mode_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_port_fec_mode,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_port_fec_mode_str =
        TOKEN_STRING_INITIALIZER
                (struct cmd_set_port_fec_mode,
@@ -18007,7 +16496,7 @@ cmdline_parse_token_string_t cmd_show_port_supported_ptypes_port =
 cmdline_parse_token_num_t cmd_show_port_supported_ptypes_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_show_port_supported_ptypes_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_port_supported_ptypes_ptypes =
        TOKEN_STRING_INITIALIZER
                (struct cmd_show_port_supported_ptypes_result,
@@ -18155,19 +16644,19 @@ cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_port =
                        cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_pid =
        TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-                       cmd_pid, UINT16);
+                       cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
                        cmd_keyword, "rxq#txq");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_qid =
        TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-                       cmd_qid, UINT16);
+                       cmd_qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_desc =
        TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
                        cmd_desc, "desc");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_did =
        TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-                       cmd_did, UINT16);
+                       cmd_did, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_status =
        TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
                        cmd_status, "status");
@@ -18210,7 +16699,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_port =
 cmdline_parse_token_num_t cmd_set_port_ptypes_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_port_ptypes_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
        TOKEN_STRING_INITIALIZER
                (struct cmd_set_port_ptypes_result,
@@ -18218,7 +16707,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
 cmdline_parse_token_num_t cmd_set_port_ptypes_mask_u32 =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_port_ptypes_result,
-                mask, UINT32);
+                mask, RTE_UINT32);
 
 static void
 cmd_set_port_ptypes_parsed(
@@ -18303,7 +16792,7 @@ cmdline_parse_token_string_t cmd_showport_macs_port =
                        cmd_port, "port");
 cmdline_parse_token_num_t cmd_showport_macs_pid =
        TOKEN_NUM_INITIALIZER(struct cmd_showport_macs_result,
-                       cmd_pid, UINT16);
+                       cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_showport_macs_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_macs_result,
                        cmd_keyword, "macs#mcast_macs");
@@ -18454,7 +16943,6 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_vf_mac_addr_filter,
        (cmdline_parse_inst_t *)&cmd_queue_rate_limit,
        (cmdline_parse_inst_t *)&cmd_tunnel_udp_config,
-       (cmdline_parse_inst_t *)&cmd_global_config,
        (cmdline_parse_inst_t *)&cmd_set_mirror_mask,
        (cmdline_parse_inst_t *)&cmd_set_mirror_link,
        (cmdline_parse_inst_t *)&cmd_reset_mirror_rule,
@@ -18463,20 +16951,13 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_config_rss_hash_key,
        (cmdline_parse_inst_t *)&cmd_dump,
        (cmdline_parse_inst_t *)&cmd_dump_one,
-       (cmdline_parse_inst_t *)&cmd_add_del_ip_flow_director,
-       (cmdline_parse_inst_t *)&cmd_add_del_udp_flow_director,
-       (cmdline_parse_inst_t *)&cmd_add_del_sctp_flow_director,
-       (cmdline_parse_inst_t *)&cmd_add_del_l2_flow_director,
-       (cmdline_parse_inst_t *)&cmd_add_del_mac_vlan_flow_director,
-       (cmdline_parse_inst_t *)&cmd_add_del_tunnel_flow_director,
+#ifdef RTE_NET_I40E
        (cmdline_parse_inst_t *)&cmd_add_del_raw_flow_director,
-       (cmdline_parse_inst_t *)&cmd_flush_flow_director,
+#endif
        (cmdline_parse_inst_t *)&cmd_set_flow_director_ip_mask,
        (cmdline_parse_inst_t *)&cmd_set_flow_director_mac_vlan_mask,
        (cmdline_parse_inst_t *)&cmd_set_flow_director_tunnel_mask,
-       (cmdline_parse_inst_t *)&cmd_set_flow_director_flex_mask,
        (cmdline_parse_inst_t *)&cmd_set_flow_director_flex_payload,
-       (cmdline_parse_inst_t *)&cmd_set_fdir_input_set,
        (cmdline_parse_inst_t *)&cmd_flow,
        (cmdline_parse_inst_t *)&cmd_show_port_meter_cap,
        (cmdline_parse_inst_t *)&cmd_add_port_meter_profile_srtcm,
@@ -18492,14 +16973,6 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_set_port_meter_stats_mask,
        (cmdline_parse_inst_t *)&cmd_show_port_meter_stats,
        (cmdline_parse_inst_t *)&cmd_mcast_addr,
-       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_eth_type_all,
-       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_eth_type_specific,
-       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_en_dis_all,
-       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_en_dis_specific,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_insertion_en,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_insertion_dis,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_stripping_en_dis,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_forwarding_en_dis,
        (cmdline_parse_inst_t *)&cmd_set_vf_vlan_anti_spoof,
        (cmdline_parse_inst_t *)&cmd_set_vf_mac_anti_spoof,
        (cmdline_parse_inst_t *)&cmd_set_vf_vlan_stripq,