app/testpmd: fix build without i40e
[dpdk.git] / app / test-pmd / cmdline.c
index 8e76ec6..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,10 +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"
-                       " (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"
 
@@ -1285,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,
@@ -1423,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,
@@ -1647,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");
@@ -1719,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,
@@ -1773,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,
@@ -1864,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,
@@ -1946,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,
@@ -2018,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,
@@ -2067,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,
@@ -2180,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"))
@@ -2239,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")) {
@@ -2309,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,
@@ -2410,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");
@@ -2422,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);
 
@@ -2435,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,
@@ -2514,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,
@@ -2615,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");
@@ -2695,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");
@@ -2737,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");
 
@@ -2950,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 =
@@ -3061,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);
@@ -3112,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");
@@ -3216,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 =
@@ -3224,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 =
@@ -3323,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,
@@ -3392,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,
@@ -3456,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,
@@ -3662,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,
@@ -3708,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,
@@ -3756,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,
@@ -4028,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,
@@ -4192,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,
@@ -4242,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,
@@ -4298,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,
@@ -4355,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,
@@ -4413,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");
@@ -4471,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,
@@ -4677,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,
@@ -4748,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,
@@ -4836,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,
@@ -4985,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,
@@ -5052,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");
@@ -5102,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");
@@ -5152,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,
@@ -5202,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,
@@ -5261,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,
@@ -5319,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,
@@ -5462,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,
@@ -5568,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,
@@ -5734,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,
@@ -5783,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,
@@ -5860,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");
@@ -5928,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");
@@ -6076,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,
@@ -6129,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,
@@ -6187,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,
@@ -6245,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,
@@ -6327,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,
@@ -6383,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);
 
@@ -6436,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,
@@ -6498,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(
@@ -6686,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,
@@ -6748,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");
@@ -6822,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");
@@ -6900,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");
@@ -6933,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
@@ -7229,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,
@@ -7379,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,
@@ -7410,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,
@@ -7449,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,
@@ -7646,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,
@@ -7736,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");
 
@@ -7782,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,
@@ -7865,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,
@@ -7910,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,
@@ -7961,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,
@@ -8004,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,
@@ -8053,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,
@@ -8111,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,
@@ -8163,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,
@@ -8245,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);
 
@@ -8291,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);
 
@@ -8340,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,
@@ -8526,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");
@@ -8587,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");
@@ -8644,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");
@@ -8732,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");
@@ -8815,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);
@@ -8906,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,
@@ -8973,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,
@@ -9043,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,
@@ -9124,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,
@@ -9197,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,
@@ -9210,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,
@@ -9250,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"
@@ -9269,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");
@@ -9365,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");
@@ -9380,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");
@@ -9451,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,
@@ -9704,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");
@@ -9713,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,
@@ -9804,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");
@@ -9813,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,
@@ -9895,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");
@@ -9904,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,
@@ -9988,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");
@@ -10069,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");
@@ -10090,6 +10097,30 @@ cmdline_parse_inst_t cmd_show_queue_region_info_all = {
 
 /* *** Filters Control *** */
 
+#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)
+
+#ifdef RTE_NET_I40E
+
 static uint16_t
 str2flowtype(char *string)
 {
@@ -10125,30 +10156,6 @@ str2flowtype(char *string)
        return RTE_ETH_FLOW_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)
-
-#ifdef RTE_NET_I40E
-
 /* *** deal with flow director filter *** */
 struct cmd_flow_director_result {
        cmdline_fixed_string_t flow_director_filter;
@@ -10231,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");
@@ -10249,13 +10256,13 @@ cmdline_parse_token_string_t cmd_flow_director_queue =
                                 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,
@@ -10378,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");
@@ -10396,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");
@@ -10408,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,
@@ -10427,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,
@@ -10594,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");
@@ -10653,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);
 
@@ -10671,437 +10679,6 @@ cmdline_parse_inst_t cmd_mcast_addr = {
        },
 };
 
-/* l2 tunnel config
- * only support E-tag now.
- */
-
-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;
-}
-
-/* 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 */
@@ -11135,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,
@@ -11241,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,
@@ -11347,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,
@@ -11453,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(
@@ -11551,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,
@@ -11651,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,
@@ -11743,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,
@@ -11837,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);
@@ -11938,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,
@@ -12053,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,
@@ -12148,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,
@@ -12156,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(
@@ -12240,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,
@@ -12360,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,
@@ -12450,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,
@@ -12540,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,
@@ -12634,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,
@@ -12744,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,
@@ -12764,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
@@ -13075,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");
@@ -13110,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");
@@ -13295,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");
@@ -13310,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");
@@ -13441,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");
@@ -13601,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");
@@ -13617,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");
@@ -13825,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");
@@ -13853,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");
@@ -14096,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);
 
@@ -14176,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);
 
@@ -14483,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(
@@ -14634,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,
@@ -14653,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,
@@ -14735,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,
@@ -14798,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(
@@ -14907,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(
@@ -14991,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,
@@ -15073,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,
@@ -15177,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,
@@ -15197,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(
@@ -15291,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(
@@ -15388,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(
@@ -15482,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(
@@ -15555,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(
@@ -15674,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,
@@ -15771,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,
@@ -15853,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,
@@ -15976,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,
@@ -15984,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,
@@ -16085,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,
@@ -16182,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,
@@ -16264,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,
@@ -16393,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,
@@ -16401,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,
@@ -16519,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,
@@ -16598,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");
@@ -16657,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");
@@ -16722,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");
@@ -16804,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");
@@ -16843,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,
@@ -16917,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,
@@ -17065,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");
@@ -17120,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,
@@ -17128,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(
@@ -17213,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");
@@ -17394,12 +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_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,