app/testpmd: support policy actions per color
[dpdk.git] / app / test-pmd / cmdline.c
index 84db81c..11f9c01 100644 (file)
@@ -163,7 +163,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "Display:\n"
                        "--------\n\n"
 
-                       "show port (info|stats|summary|xstats|fdir|stat_qmap|dcb_tc|cap) (port_id|all)\n"
+                       "show port (info|stats|summary|xstats|fdir|dcb_tc) (port_id|all)\n"
                        "    Display information for port_id, or all.\n\n"
 
                        "show port port_id (module_eeprom|eeprom)\n"
@@ -177,7 +177,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "show port (port_id) rss-hash [key]\n"
                        "    Display the RSS hash functions and RSS hash key of port\n\n"
 
-                       "clear port (info|stats|xstats|fdir|stat_qmap) (port_id|all)\n"
+                       "clear port (info|stats|xstats|fdir) (port_id|all)\n"
                        "    Clear information for port_id, or all.\n\n"
 
                        "show (rxq|txq) info (port_id) (queue_id)\n"
@@ -246,6 +246,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "show port (port_id) rxq|txq (queue_id) desc (desc_id) status"
                        "       Show status of rx|tx descriptor.\n\n"
 
+                       "show port (port_id) rxq (queue_id) desc used count\n"
+                       "    Show current number of filled receive"
+                       " packet descriptors.\n\n"
+
                        "show port (port_id) macs|mcast_macs"
                        "       Display list of mac addresses added to port.\n\n"
 
@@ -689,21 +693,20 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "show port meter cap (port_id)\n"
                        "    Show port meter capability information\n\n"
 
-                       "add port meter profile srtcm_rfc2697 (port_id) (profile_id) (cir) (cbs) (ebs)\n"
+                       "add port meter profile srtcm_rfc2697 (port_id) (profile_id) (cir) (cbs) (ebs) (packet_mode)\n"
                        "    meter profile add - srtcm rfc 2697\n\n"
 
-                       "add port meter profile trtcm_rfc2698 (port_id) (profile_id) (cir) (pir) (cbs) (pbs)\n"
+                       "add port meter profile trtcm_rfc2698 (port_id) (profile_id) (cir) (pir) (cbs) (pbs) (packet_mode)\n"
                        "    meter profile add - trtcm rfc 2698\n\n"
 
-                       "add port meter profile trtcm_rfc4115 (port_id) (profile_id) (cir) (eir) (cbs) (ebs)\n"
+                       "add port meter profile trtcm_rfc4115 (port_id) (profile_id) (cir) (eir) (cbs) (ebs) (packet_mode)\n"
                        "    meter profile add - trtcm rfc 4115\n\n"
 
                        "del port meter profile (port_id) (profile_id)\n"
                        "    meter profile delete\n\n"
 
-                       "create port meter (port_id) (mtr_id) (profile_id) (meter_enable)\n"
-                       "(g_action) (y_action) (r_action) (stats_mask) (shared)\n"
-                       "(use_pre_meter_color) [(dscp_tbl_entry0) (dscp_tbl_entry1)...\n"
+                       "create port meter (port_id) (mtr_id) (profile_id) (policy_id) (meter_enable)\n"
+                       "(stats_mask) (shared) (use_pre_meter_color) [(dscp_tbl_entry0) (dscp_tbl_entry1)...\n"
                        "(dscp_tbl_entry63)]\n"
                        "    meter create\n\n"
 
@@ -716,6 +719,13 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "del port meter (port_id) (mtr_id)\n"
                        "    meter delete\n\n"
 
+                       "add port meter policy (port_id) (policy_id) g_actions (actions)\n"
+                       "y_actions (actions) r_actions (actions)\n"
+                       "    meter policy add\n\n"
+
+                       "del port meter policy (port_id) (policy_id)\n"
+                       "    meter policy delete\n\n"
+
                        "set port meter profile (port_id) (mtr_id) (profile_id)\n"
                        "    meter update meter profile\n\n"
 
@@ -788,7 +798,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|mpls|none|level-default|"
                        "level-outer|level-inner|<flowtype_id>)\n"
                        "    Set the RSS mode.\n\n"
 
@@ -845,7 +855,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "fdir_inset|fdir_flx_inset clear all"
                        "    Clear RSS|FDIR|FDIR_FLX input set completely for some pctype\n\n"
 
-                       "port config (port_id) udp_tunnel_port add|rm vxlan|geneve (udp_port)\n\n"
+                       "port config (port_id) udp_tunnel_port add|rm vxlan|geneve|ecpri (udp_port)\n\n"
                        "    Add/remove UDP tunnel port for tunneling offload\n\n"
 
                        "port config <port_id> rx_offload vlan_strip|"
@@ -998,23 +1008,23 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    List and destroy aged flows"
                        " flow rules\n\n"
 
-                       "flow shared_action {port_id} create"
-                       " [action_id {shared_action_id}]"
+                       "flow indirect_action {port_id} create"
+                       " [action_id {indirect_action_id}]"
                        " [ingress] [egress]"
                        " action {action} / end\n"
-                       "    Create shared action.\n\n"
+                       "    Create indirect action.\n\n"
 
-                       "flow shared_action {port_id} update"
-                       " {shared_action_id} action {action} / end\n"
-                       "    Update shared action.\n\n"
+                       "flow indirect_action {port_id} update"
+                       " {indirect_action_id} action {action} / end\n"
+                       "    Update indirect action.\n\n"
 
-                       "flow shared_action {port_id} destroy"
-                       " action_id {shared_action_id} [...]\n"
-                       "    Destroy specific shared actions.\n\n"
+                       "flow indirect_action {port_id} destroy"
+                       " action_id {indirect_action_id} [...]\n"
+                       "    Destroy specific indirect actions.\n\n"
 
-                       "flow shared_action {port_id} query"
-                       " {shared_action_id}\n"
-                       "    Query an existing shared action.\n\n"
+                       "flow indirect_action {port_id} query"
+                       " {indirect_action_id}\n"
+                       "    Query an existing indirect action.\n\n"
 
                        "set vxlan ip-version (ipv4|ipv6) vni (vni) udp-src"
                        " (udp-src) udp-dst (udp-dst) ip-src (ip-src) ip-dst"
@@ -1267,7 +1277,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,
@@ -1405,7 +1415,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,
@@ -1521,6 +1531,9 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed)
                }
        }
 
+       if (*speed != ETH_LINK_SPEED_AUTONEG)
+               *speed |= ETH_LINK_SPEED_FIXED;
+
        return 0;
 }
 
@@ -1629,7 +1642,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");
@@ -1701,7 +1714,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,
@@ -1755,13 +1768,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,
@@ -1846,7 +1859,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,
@@ -1877,7 +1890,9 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
                                __rte_unused void *data)
 {
        struct cmd_config_max_pkt_len_result *res = parsed_result;
+       uint32_t max_rx_pkt_len_backup = 0;
        portid_t pid;
+       int ret;
 
        if (!all_ports_stopped()) {
                printf("Please stop all ports first\n");
@@ -1886,7 +1901,6 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
 
        RTE_ETH_FOREACH_DEV(pid) {
                struct rte_port *port = &ports[pid];
-               uint64_t rx_offloads = port->dev_conf.rxmode.offloads;
 
                if (!strcmp(res->name, "max-pkt-len")) {
                        if (res->value < RTE_ETHER_MIN_LEN) {
@@ -1897,12 +1911,18 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
                        if (res->value == port->dev_conf.rxmode.max_rx_pkt_len)
                                return;
 
+                       ret = eth_dev_info_get_print_err(pid, &port->dev_info);
+                       if (ret != 0) {
+                               printf("rte_eth_dev_info_get() failed for port %u\n",
+                                       pid);
+                               return;
+                       }
+
+                       max_rx_pkt_len_backup = port->dev_conf.rxmode.max_rx_pkt_len;
+
                        port->dev_conf.rxmode.max_rx_pkt_len = res->value;
-                       if (res->value > RTE_ETHER_MAX_LEN)
-                               rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
-                       else
-                               rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
-                       port->dev_conf.rxmode.offloads = rx_offloads;
+                       if (update_jumbo_frame_offload(pid) != 0)
+                               port->dev_conf.rxmode.max_rx_pkt_len = max_rx_pkt_len_backup;
                } else {
                        printf("Unknown parameter\n");
                        return;
@@ -1928,7 +1948,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,
@@ -2000,7 +2020,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,
@@ -2049,9 +2069,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,
@@ -2162,7 +2184,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"))
@@ -2221,6 +2244,10 @@ 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, "mpls"))
+               rss_conf.rss_hf = ETH_RSS_MPLS;
        else if (!strcmp(res->value, "none"))
                rss_conf.rss_hf = 0;
        else if (!strcmp(res->value, "level-default")) {
@@ -2291,7 +2318,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|mpls|none|level-default|"
                "level-outer|level-inner|<flowtype_id>",
        .tokens = {
                (void *)&cmd_config_rss_port,
@@ -2392,7 +2419,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");
@@ -2404,7 +2432,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#mpls");
 cmdline_parse_token_string_t cmd_config_rss_hash_key_value =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, key, NULL);
 
@@ -2417,7 +2445,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|mpls "
                "<string of hex digits (variable length, NIC dependent)>",
        .tokens = {
                (void *)&cmd_config_rss_hash_key_port,
@@ -2496,19 +2524,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,
@@ -2597,11 +2625,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");
@@ -2677,13 +2705,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");
@@ -2719,11 +2747,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");
 
@@ -2932,7 +2960,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 =
@@ -3043,13 +3071,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);
@@ -3094,7 +3122,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");
@@ -3198,7 +3227,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 =
@@ -3206,7 +3235,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 =
@@ -3305,7 +3334,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,
@@ -3374,7 +3403,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,
@@ -3438,7 +3467,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,
@@ -3644,7 +3673,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,
@@ -3690,7 +3719,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,
@@ -3738,7 +3767,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,
@@ -3775,6 +3804,7 @@ cmd_set_rxoffs_parsed(void *parsed_result,
                                  MAX_SEGS_BUFFER_SPLIT, seg_offsets, 0);
        if (nb_segs > 0)
                set_rx_pkt_offsets(seg_offsets, nb_segs);
+       cmd_reconfig_device_queue(RTE_PORT_ALL, 0, 1);
 }
 
 cmdline_parse_token_string_t cmd_set_rxoffs_keyword =
@@ -3821,6 +3851,7 @@ cmd_set_rxpkts_parsed(void *parsed_result,
                                  MAX_SEGS_BUFFER_SPLIT, seg_lengths, 0);
        if (nb_segs > 0)
                set_rx_pkt_segments(seg_lengths, nb_segs);
+       cmd_reconfig_device_queue(RTE_PORT_ALL, 0, 1);
 }
 
 cmdline_parse_token_string_t cmd_set_rxpkts_keyword =
@@ -4010,7 +4041,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,
@@ -4174,10 +4205,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,
@@ -4224,10 +4255,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,
@@ -4280,10 +4311,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,
@@ -4337,13 +4368,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,
@@ -4395,10 +4426,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");
@@ -4453,7 +4484,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,
@@ -4659,7 +4690,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,
@@ -4730,7 +4761,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,
@@ -4818,10 +4849,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,
@@ -4967,10 +4998,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,
@@ -5034,7 +5065,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");
@@ -5084,7 +5115,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");
@@ -5134,7 +5165,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,
@@ -5184,7 +5215,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,
@@ -5243,7 +5274,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,
@@ -5301,7 +5332,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,
@@ -5444,7 +5475,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,
@@ -5550,7 +5581,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,
@@ -5716,7 +5747,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,
@@ -5765,10 +5796,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,
@@ -5842,7 +5873,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");
@@ -5910,7 +5941,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");
@@ -6058,7 +6089,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,
@@ -6111,10 +6142,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,
@@ -6169,10 +6200,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,
@@ -6227,10 +6258,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,
@@ -6309,10 +6340,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,
@@ -6365,7 +6396,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);
 
@@ -6418,10 +6449,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,
@@ -6480,7 +6511,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(
@@ -6668,11 +6699,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,
@@ -6730,7 +6763,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");
@@ -6804,7 +6837,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");
@@ -6882,25 +6915,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");
@@ -6915,7 +6948,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
@@ -7211,19 +7244,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,
@@ -7361,7 +7394,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,
@@ -7392,7 +7425,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,
@@ -7431,7 +7465,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,
@@ -7544,15 +7579,9 @@ static void cmd_showportall_parsed(void *parsed_result,
                RTE_ETH_FOREACH_DEV(i)
                        fdir_get_infos(i);
 #endif
-       else if (!strcmp(res->what, "stat_qmap"))
-               RTE_ETH_FOREACH_DEV(i)
-                       nic_stats_mapping_display(i);
        else if (!strcmp(res->what, "dcb_tc"))
                RTE_ETH_FOREACH_DEV(i)
                        port_dcb_info_display(i);
-       else if (!strcmp(res->what, "cap"))
-               RTE_ETH_FOREACH_DEV(i)
-                       port_offload_cap_display(i);
 }
 
 cmdline_parse_token_string_t cmd_showportall_show =
@@ -7562,14 +7591,14 @@ cmdline_parse_token_string_t cmd_showportall_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showportall_result, port, "port");
 cmdline_parse_token_string_t cmd_showportall_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showportall_result, what,
-                                "info#summary#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
+                                "info#summary#stats#xstats#fdir#dcb_tc");
 cmdline_parse_token_string_t cmd_showportall_all =
        TOKEN_STRING_INITIALIZER(struct cmd_showportall_result, all, "all");
 cmdline_parse_inst_t cmd_showportall = {
        .f = cmd_showportall_parsed,
        .data = NULL,
        .help_str = "show|clear port "
-               "info|summary|stats|xstats|fdir|stat_qmap|dcb_tc|cap all",
+               "info|summary|stats|xstats|fdir|dcb_tc all",
        .tokens = {
                (void *)&cmd_showportall_show,
                (void *)&cmd_showportall_port,
@@ -7611,12 +7640,8 @@ static void cmd_showport_parsed(void *parsed_result,
        else if (!strcmp(res->what, "fdir"))
                 fdir_get_infos(res->portnum);
 #endif
-       else if (!strcmp(res->what, "stat_qmap"))
-               nic_stats_mapping_display(res->portnum);
        else if (!strcmp(res->what, "dcb_tc"))
                port_dcb_info_display(res->portnum);
-       else if (!strcmp(res->what, "cap"))
-               port_offload_cap_display(res->portnum);
 }
 
 cmdline_parse_token_string_t cmd_showport_show =
@@ -7626,15 +7651,15 @@ cmdline_parse_token_string_t cmd_showport_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_result, port, "port");
 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");
+                                "info#summary#stats#xstats#fdir#dcb_tc");
 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,
        .data = NULL,
        .help_str = "show|clear port "
-               "info|summary|stats|xstats|fdir|stat_qmap|dcb_tc|cap "
+               "info|summary|stats|xstats|fdir|dcb_tc "
                "<port_id>",
        .tokens = {
                (void *)&cmd_showport_show,
@@ -7718,7 +7743,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");
 
@@ -7764,9 +7790,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,
@@ -7847,9 +7875,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,
@@ -7892,16 +7920,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,
@@ -7943,11 +7971,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,
@@ -7986,11 +8017,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,
@@ -8035,19 +8066,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,
@@ -8093,13 +8124,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,
@@ -8145,11 +8180,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,
@@ -8227,7 +8265,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);
 
@@ -8273,7 +8311,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);
 
@@ -8322,13 +8361,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,
@@ -8508,7 +8547,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");
@@ -8569,7 +8608,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");
@@ -8626,13 +8665,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");
@@ -8714,13 +8753,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");
@@ -8797,13 +8836,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);
@@ -8888,19 +8927,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,
@@ -8955,19 +8994,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,
@@ -9025,25 +9064,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,
@@ -9067,7 +9106,7 @@ cmdline_parse_inst_t cmd_vf_rate_limit = {
 
 /* *** CONFIGURE TUNNEL UDP PORT *** */
 struct cmd_tunnel_udp_config {
-       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t rx_vxlan_port;
        cmdline_fixed_string_t what;
        uint16_t udp_port;
        portid_t port_id;
@@ -9083,9 +9122,7 @@ cmd_tunnel_udp_config_parsed(void *parsed_result,
        int ret;
 
        tunnel_udp.udp_port = res->udp_port;
-
-       if (!strcmp(res->cmd, "rx_vxlan_port"))
-               tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
+       tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
 
        if (!strcmp(res->what, "add"))
                ret = rte_eth_dev_udp_tunnel_port_add(res->port_id,
@@ -9098,18 +9135,18 @@ cmd_tunnel_udp_config_parsed(void *parsed_result,
                printf("udp tunneling add error: (%s)\n", strerror(-ret));
 }
 
-cmdline_parse_token_string_t cmd_tunnel_udp_config_cmd =
+cmdline_parse_token_string_t cmd_tunnel_udp_config_rx_vxlan_port =
        TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config,
-                               cmd, "rx_vxlan_port");
+                               rx_vxlan_port, "rx_vxlan_port");
 cmdline_parse_token_string_t cmd_tunnel_udp_config_what =
        TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config,
                                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,
@@ -9117,7 +9154,7 @@ cmdline_parse_inst_t cmd_tunnel_udp_config = {
        .help_str = "rx_vxlan_port add|rm <udp_port> <port_id>: "
                "Add/Remove a tunneling UDP port filter",
        .tokens = {
-               (void *)&cmd_tunnel_udp_config_cmd,
+               (void *)&cmd_tunnel_udp_config_rx_vxlan_port,
                (void *)&cmd_tunnel_udp_config_what,
                (void *)&cmd_tunnel_udp_config_udp_port,
                (void *)&cmd_tunnel_udp_config_port_id,
@@ -9155,6 +9192,8 @@ cmd_cfg_tunnel_udp_port_parsed(void *parsed_result,
                tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
        } else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
                tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
+       } else if (!strcmp(res->tunnel_type, "ecpri")) {
+               tunnel_udp.prot_type = RTE_TUNNEL_TYPE_ECPRI;
        } else {
                printf("Invalid tunnel type\n");
                return;
@@ -9179,7 +9218,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,
@@ -9189,15 +9228,16 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_action =
                                 "add#rm");
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
        TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, tunnel_type,
-                                "vxlan#geneve#vxlan-gpe");
+                                "vxlan#geneve#vxlan-gpe#ecpri");
 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,
        .data = NULL,
-       .help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve|vxlan-gpe <udp_port>",
+       .help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|"
+               "geneve|vxlan-gpe|ecpri <udp_port>",
        .tokens = {
                (void *)&cmd_config_tunnel_udp_port_port,
                (void *)&cmd_config_tunnel_udp_port_config,
@@ -9232,13 +9272,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"
@@ -9251,7 +9291,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");
@@ -9347,13 +9387,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");
@@ -9362,7 +9402,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");
@@ -9433,13 +9473,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,
@@ -9686,7 +9726,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");
@@ -9695,19 +9735,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,
@@ -9786,7 +9826,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");
@@ -9795,13 +9835,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,
@@ -9877,7 +9917,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");
@@ -9886,13 +9926,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,
@@ -9970,7 +10010,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");
@@ -10051,7 +10091,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");
@@ -10072,6 +10112,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)
 {
@@ -10107,30 +10171,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;
@@ -10213,7 +10253,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");
@@ -10231,13 +10271,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,
@@ -10360,13 +10400,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");
@@ -10378,7 +10418,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");
@@ -10390,7 +10430,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,
@@ -10409,19 +10449,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,
@@ -10576,7 +10616,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");
@@ -10635,7 +10675,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);
 
@@ -10686,11 +10727,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,
@@ -10792,11 +10833,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,
@@ -10898,11 +10939,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,
@@ -11004,15 +11045,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(
@@ -11102,7 +11143,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,
@@ -11202,7 +11243,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,
@@ -11294,11 +11335,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,
@@ -11388,11 +11429,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);
@@ -11489,7 +11530,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,
@@ -11604,7 +11645,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,
@@ -11699,7 +11740,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,
@@ -11707,7 +11748,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(
@@ -11791,19 +11832,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,
@@ -11911,11 +11952,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,
@@ -12001,11 +12042,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,
@@ -12091,11 +12132,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,
@@ -12185,11 +12226,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,
@@ -12295,19 +12336,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,
@@ -12315,7 +12356,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
@@ -12626,27 +12667,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");
@@ -12661,7 +12702,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");
@@ -12846,7 +12887,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");
@@ -12861,7 +12902,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");
@@ -12992,7 +13033,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");
@@ -13152,7 +13193,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");
@@ -13168,7 +13209,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");
@@ -13376,19 +13417,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");
@@ -13404,7 +13445,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");
@@ -13586,6 +13627,359 @@ cmdline_parse_inst_t cmd_set_mplsoudp_decap_with_vlan = {
        },
 };
 
+/** Set connection tracking object common details */
+struct cmd_set_conntrack_common_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t conntrack;
+       cmdline_fixed_string_t common;
+       cmdline_fixed_string_t peer;
+       cmdline_fixed_string_t is_orig;
+       cmdline_fixed_string_t enable;
+       cmdline_fixed_string_t live;
+       cmdline_fixed_string_t sack;
+       cmdline_fixed_string_t cack;
+       cmdline_fixed_string_t last_dir;
+       cmdline_fixed_string_t liberal;
+       cmdline_fixed_string_t state;
+       cmdline_fixed_string_t max_ack_win;
+       cmdline_fixed_string_t retrans;
+       cmdline_fixed_string_t last_win;
+       cmdline_fixed_string_t last_seq;
+       cmdline_fixed_string_t last_ack;
+       cmdline_fixed_string_t last_end;
+       cmdline_fixed_string_t last_index;
+       uint8_t stat;
+       uint8_t factor;
+       uint16_t peer_port;
+       uint32_t is_original;
+       uint32_t en;
+       uint32_t is_live;
+       uint32_t s_ack;
+       uint32_t c_ack;
+       uint32_t ld;
+       uint32_t lb;
+       uint8_t re_num;
+       uint8_t li;
+       uint16_t lw;
+       uint32_t ls;
+       uint32_t la;
+       uint32_t le;
+};
+
+cmdline_parse_token_string_t cmd_set_conntrack_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                set, "set");
+cmdline_parse_token_string_t cmd_set_conntrack_conntrack =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                conntrack, "conntrack");
+cmdline_parse_token_string_t cmd_set_conntrack_common_com =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                common, "com");
+cmdline_parse_token_string_t cmd_set_conntrack_common_peer =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                peer, "peer");
+cmdline_parse_token_num_t cmd_set_conntrack_common_peer_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             peer_port, RTE_UINT16);
+cmdline_parse_token_string_t cmd_set_conntrack_common_is_orig =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                is_orig, "is_orig");
+cmdline_parse_token_num_t cmd_set_conntrack_common_is_orig_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             is_original, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_enable =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                enable, "enable");
+cmdline_parse_token_num_t cmd_set_conntrack_common_enable_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             en, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_live =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                live, "live");
+cmdline_parse_token_num_t cmd_set_conntrack_common_live_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             is_live, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_sack =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                sack, "sack");
+cmdline_parse_token_num_t cmd_set_conntrack_common_sack_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             s_ack, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_cack =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                cack, "cack");
+cmdline_parse_token_num_t cmd_set_conntrack_common_cack_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             c_ack, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_last_dir =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                last_dir, "last_dir");
+cmdline_parse_token_num_t cmd_set_conntrack_common_last_dir_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             ld, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_liberal =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                liberal, "liberal");
+cmdline_parse_token_num_t cmd_set_conntrack_common_liberal_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             lb, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_state =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                state, "state");
+cmdline_parse_token_num_t cmd_set_conntrack_common_state_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             stat, RTE_UINT8);
+cmdline_parse_token_string_t cmd_set_conntrack_common_max_ackwin =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                max_ack_win, "max_ack_win");
+cmdline_parse_token_num_t cmd_set_conntrack_common_max_ackwin_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             factor, RTE_UINT8);
+cmdline_parse_token_string_t cmd_set_conntrack_common_retrans =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                retrans, "r_lim");
+cmdline_parse_token_num_t cmd_set_conntrack_common_retrans_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             re_num, RTE_UINT8);
+cmdline_parse_token_string_t cmd_set_conntrack_common_last_win =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                last_win, "last_win");
+cmdline_parse_token_num_t cmd_set_conntrack_common_last_win_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             lw, RTE_UINT16);
+cmdline_parse_token_string_t cmd_set_conntrack_common_last_seq =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                last_seq, "last_seq");
+cmdline_parse_token_num_t cmd_set_conntrack_common_last_seq_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             ls, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_last_ack =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                last_ack, "last_ack");
+cmdline_parse_token_num_t cmd_set_conntrack_common_last_ack_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             la, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_last_end =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                last_end, "last_end");
+cmdline_parse_token_num_t cmd_set_conntrack_common_last_end_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             le, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_common_last_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result,
+                                last_index, "last_index");
+cmdline_parse_token_num_t cmd_set_conntrack_common_last_index_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result,
+                             li, RTE_UINT8);
+
+static void cmd_set_conntrack_common_parsed(void *parsed_result,
+       __rte_unused struct cmdline *cl,
+       __rte_unused void *data)
+{
+       struct cmd_set_conntrack_common_result *res = parsed_result;
+
+       /* No need to swap to big endian. */
+       conntrack_context.peer_port = res->peer_port;
+       conntrack_context.is_original_dir = res->is_original;
+       conntrack_context.enable = res->en;
+       conntrack_context.live_connection = res->is_live;
+       conntrack_context.selective_ack = res->s_ack;
+       conntrack_context.challenge_ack_passed = res->c_ack;
+       conntrack_context.last_direction = res->ld;
+       conntrack_context.liberal_mode = res->lb;
+       conntrack_context.state = (enum rte_flow_conntrack_state)res->stat;
+       conntrack_context.max_ack_window = res->factor;
+       conntrack_context.retransmission_limit = res->re_num;
+       conntrack_context.last_window = res->lw;
+       conntrack_context.last_index =
+               (enum rte_flow_conntrack_tcp_last_index)res->li;
+       conntrack_context.last_seq = res->ls;
+       conntrack_context.last_ack = res->la;
+       conntrack_context.last_end = res->le;
+}
+
+cmdline_parse_inst_t cmd_set_conntrack_common = {
+       .f = cmd_set_conntrack_common_parsed,
+       .data = NULL,
+       .help_str = "set conntrack com peer <port_id> is_orig <dir> enable <en>"
+               " live <ack_seen> sack <en> cack <passed> last_dir <dir>"
+               " liberal <en> state <s> max_ack_win <factor> r_lim <num>"
+               " last_win <win> last_seq <seq> last_ack <ack> last_end <end>"
+               " last_index <flag>",
+       .tokens = {
+               (void *)&cmd_set_conntrack_set,
+               (void *)&cmd_set_conntrack_conntrack,
+               (void *)&cmd_set_conntrack_common_com,
+               (void *)&cmd_set_conntrack_common_peer,
+               (void *)&cmd_set_conntrack_common_peer_value,
+               (void *)&cmd_set_conntrack_common_is_orig,
+               (void *)&cmd_set_conntrack_common_is_orig_value,
+               (void *)&cmd_set_conntrack_common_enable,
+               (void *)&cmd_set_conntrack_common_enable_value,
+               (void *)&cmd_set_conntrack_common_live,
+               (void *)&cmd_set_conntrack_common_live_value,
+               (void *)&cmd_set_conntrack_common_sack,
+               (void *)&cmd_set_conntrack_common_sack_value,
+               (void *)&cmd_set_conntrack_common_cack,
+               (void *)&cmd_set_conntrack_common_cack_value,
+               (void *)&cmd_set_conntrack_common_last_dir,
+               (void *)&cmd_set_conntrack_common_last_dir_value,
+               (void *)&cmd_set_conntrack_common_liberal,
+               (void *)&cmd_set_conntrack_common_liberal_value,
+               (void *)&cmd_set_conntrack_common_state,
+               (void *)&cmd_set_conntrack_common_state_value,
+               (void *)&cmd_set_conntrack_common_max_ackwin,
+               (void *)&cmd_set_conntrack_common_max_ackwin_value,
+               (void *)&cmd_set_conntrack_common_retrans,
+               (void *)&cmd_set_conntrack_common_retrans_value,
+               (void *)&cmd_set_conntrack_common_last_win,
+               (void *)&cmd_set_conntrack_common_last_win_value,
+               (void *)&cmd_set_conntrack_common_last_seq,
+               (void *)&cmd_set_conntrack_common_last_seq_value,
+               (void *)&cmd_set_conntrack_common_last_ack,
+               (void *)&cmd_set_conntrack_common_last_ack_value,
+               (void *)&cmd_set_conntrack_common_last_end,
+               (void *)&cmd_set_conntrack_common_last_end_value,
+               (void *)&cmd_set_conntrack_common_last_index,
+               (void *)&cmd_set_conntrack_common_last_index_value,
+               NULL,
+       },
+};
+
+/** Set connection tracking object both directions' details */
+struct cmd_set_conntrack_dir_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t conntrack;
+       cmdline_fixed_string_t dir;
+       cmdline_fixed_string_t scale;
+       cmdline_fixed_string_t fin;
+       cmdline_fixed_string_t ack_seen;
+       cmdline_fixed_string_t unack;
+       cmdline_fixed_string_t sent_end;
+       cmdline_fixed_string_t reply_end;
+       cmdline_fixed_string_t max_win;
+       cmdline_fixed_string_t max_ack;
+       uint32_t factor;
+       uint32_t f;
+       uint32_t as;
+       uint32_t un;
+       uint32_t se;
+       uint32_t re;
+       uint32_t mw;
+       uint32_t ma;
+};
+
+cmdline_parse_token_string_t cmd_set_conntrack_dir_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                set, "set");
+cmdline_parse_token_string_t cmd_set_conntrack_dir_conntrack =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                conntrack, "conntrack");
+cmdline_parse_token_string_t cmd_set_conntrack_dir_dir =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                dir, "orig#rply");
+cmdline_parse_token_string_t cmd_set_conntrack_dir_scale =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                scale, "scale");
+cmdline_parse_token_num_t cmd_set_conntrack_dir_scale_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                             factor, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_dir_fin =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                fin, "fin");
+cmdline_parse_token_num_t cmd_set_conntrack_dir_fin_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                             f, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_dir_ack =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                ack_seen, "acked");
+cmdline_parse_token_num_t cmd_set_conntrack_dir_ack_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                             as, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_dir_unack_data =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                unack, "unack_data");
+cmdline_parse_token_num_t cmd_set_conntrack_dir_unack_data_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                             un, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_dir_sent_end =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                sent_end, "sent_end");
+cmdline_parse_token_num_t cmd_set_conntrack_dir_sent_end_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                             se, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_dir_reply_end =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                reply_end, "reply_end");
+cmdline_parse_token_num_t cmd_set_conntrack_dir_reply_end_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                             re, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_dir_max_win =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                max_win, "max_win");
+cmdline_parse_token_num_t cmd_set_conntrack_dir_max_win_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                             mw, RTE_UINT32);
+cmdline_parse_token_string_t cmd_set_conntrack_dir_max_ack =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                                max_ack, "max_ack");
+cmdline_parse_token_num_t cmd_set_conntrack_dir_max_ack_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result,
+                             ma, RTE_UINT32);
+
+static void cmd_set_conntrack_dir_parsed(void *parsed_result,
+       __rte_unused struct cmdline *cl,
+       __rte_unused void *data)
+{
+       struct cmd_set_conntrack_dir_result *res = parsed_result;
+       struct rte_flow_tcp_dir_param *dir = NULL;
+
+       if (strcmp(res->dir, "orig") == 0)
+               dir = &conntrack_context.original_dir;
+       else if (strcmp(res->dir, "rply") == 0)
+               dir = &conntrack_context.reply_dir;
+       else
+               return;
+       dir->scale = res->factor;
+       dir->close_initiated = res->f;
+       dir->last_ack_seen = res->as;
+       dir->data_unacked = res->un;
+       dir->sent_end = res->se;
+       dir->reply_end = res->re;
+       dir->max_ack = res->ma;
+       dir->max_win = res->mw;
+}
+
+cmdline_parse_inst_t cmd_set_conntrack_dir = {
+       .f = cmd_set_conntrack_dir_parsed,
+       .data = NULL,
+       .help_str = "set conntrack orig|rply scale <factor> fin <sent>"
+                   " acked <seen> unack_data <unack> sent_end <sent>"
+                   " reply_end <reply> max_win <win> max_ack <ack>",
+       .tokens = {
+               (void *)&cmd_set_conntrack_set,
+               (void *)&cmd_set_conntrack_conntrack,
+               (void *)&cmd_set_conntrack_dir_dir,
+               (void *)&cmd_set_conntrack_dir_scale,
+               (void *)&cmd_set_conntrack_dir_scale_value,
+               (void *)&cmd_set_conntrack_dir_fin,
+               (void *)&cmd_set_conntrack_dir_fin_value,
+               (void *)&cmd_set_conntrack_dir_ack,
+               (void *)&cmd_set_conntrack_dir_ack_value,
+               (void *)&cmd_set_conntrack_dir_unack_data,
+               (void *)&cmd_set_conntrack_dir_unack_data_value,
+               (void *)&cmd_set_conntrack_dir_sent_end,
+               (void *)&cmd_set_conntrack_dir_sent_end_value,
+               (void *)&cmd_set_conntrack_dir_reply_end,
+               (void *)&cmd_set_conntrack_dir_reply_end_value,
+               (void *)&cmd_set_conntrack_dir_max_win,
+               (void *)&cmd_set_conntrack_dir_max_win_value,
+               (void *)&cmd_set_conntrack_dir_max_ack,
+               (void *)&cmd_set_conntrack_dir_max_ack_value,
+               NULL,
+       },
+};
+
 /* Strict link priority scheduling mode setting */
 static void
 cmd_strict_link_prio_parsed(
@@ -13647,7 +14041,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);
 
@@ -13727,7 +14122,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);
 
@@ -14034,7 +14429,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(
@@ -14185,13 +14581,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,
@@ -14204,7 +14600,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,
@@ -14286,13 +14682,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,
@@ -14349,11 +14745,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(
@@ -14458,11 +14854,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(
@@ -14542,7 +14938,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,
@@ -14624,7 +15020,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,
@@ -14728,7 +15124,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,
@@ -14748,7 +15144,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(
@@ -14842,11 +15238,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(
@@ -14939,19 +15335,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(
@@ -15033,7 +15429,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(
@@ -15106,15 +15502,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(
@@ -15225,7 +15621,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,
@@ -15322,7 +15718,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,
@@ -15404,7 +15800,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,
@@ -15527,7 +15923,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,
@@ -15535,7 +15931,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,
@@ -15636,7 +16032,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,
@@ -15733,7 +16129,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,
@@ -15815,7 +16211,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,
@@ -15944,7 +16340,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,
@@ -15952,7 +16348,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,
@@ -16070,13 +16466,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,
@@ -16149,7 +16545,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");
@@ -16208,7 +16604,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");
@@ -16240,11 +16636,9 @@ cmd_show_fec_capability_parsed(void *parsed_result,
                __rte_unused struct cmdline *cl,
                __rte_unused void *data)
 {
-#define FEC_CAP_NUM 2
        struct cmd_show_fec_capability_result *res = parsed_result;
-       struct rte_eth_fec_capa speed_fec_capa[FEC_CAP_NUM];
-       unsigned int num = FEC_CAP_NUM;
-       unsigned int ret_num;
+       struct rte_eth_fec_capa *speed_fec_capa;
+       unsigned int num;
        int ret;
 
        if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
@@ -16252,17 +16646,31 @@ cmd_show_fec_capability_parsed(void *parsed_result,
                return;
        }
 
-       ret = rte_eth_fec_get_capability(res->cmd_pid, speed_fec_capa, num);
+       ret = rte_eth_fec_get_capability(res->cmd_pid, NULL, 0);
        if (ret == -ENOTSUP) {
                printf("Function not implemented\n");
                return;
        } else if (ret < 0) {
-               printf("Get FEC capability failed\n");
+               printf("Get FEC capability failed: %d\n", ret);
                return;
        }
 
-       ret_num = (unsigned int)ret;
-       show_fec_capability(ret_num, speed_fec_capa);
+       num = (unsigned int)ret;
+       speed_fec_capa = calloc(num, sizeof(*speed_fec_capa));
+       if (speed_fec_capa == NULL) {
+               printf("Failed to alloc FEC capability buffer\n");
+               return;
+       }
+
+       ret = rte_eth_fec_get_capability(res->cmd_pid, speed_fec_capa, num);
+       if (ret < 0) {
+               printf("Error getting FEC capability: %d\n", ret);
+               goto out;
+       }
+
+       show_fec_capability(num, speed_fec_capa);
+out:
+       free(speed_fec_capa);
 }
 
 cmdline_parse_token_string_t cmd_show_fec_capability_show =
@@ -16273,7 +16681,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");
@@ -16355,7 +16763,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");
@@ -16394,7 +16802,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,
@@ -16468,7 +16876,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,
@@ -16583,7 +16991,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result,
                rc = rte_eth_rx_descriptor_status(res->cmd_pid, res->cmd_qid,
                                             res->cmd_did);
                if (rc < 0) {
-                       printf("Invalid queueid = %d\n", res->cmd_qid);
+                       printf("Invalid input: queue id = %d, desc id = %d\n",
+                              res->cmd_qid, res->cmd_did);
                        return;
                }
                if (rc == RTE_ETH_RX_DESC_AVAIL)
@@ -16596,7 +17005,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result,
                rc = rte_eth_tx_descriptor_status(res->cmd_pid, res->cmd_qid,
                                             res->cmd_did);
                if (rc < 0) {
-                       printf("Invalid queueid = %d\n", res->cmd_qid);
+                       printf("Invalid input: queue id = %d, desc id = %d\n",
+                              res->cmd_qid, res->cmd_did);
                        return;
                }
                if (rc == RTE_ETH_TX_DESC_FULL)
@@ -16616,19 +17026,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");
@@ -16650,6 +17060,88 @@ cmdline_parse_inst_t cmd_show_rx_tx_desc_status = {
        },
 };
 
+/* *** display rx queue desc used count *** */
+struct cmd_show_rx_queue_desc_used_count_result {
+       cmdline_fixed_string_t cmd_show;
+       cmdline_fixed_string_t cmd_port;
+       cmdline_fixed_string_t cmd_rxq;
+       cmdline_fixed_string_t cmd_desc;
+       cmdline_fixed_string_t cmd_used;
+       cmdline_fixed_string_t cmd_count;
+       portid_t cmd_pid;
+       portid_t cmd_qid;
+};
+
+static void
+cmd_show_rx_queue_desc_used_count_parsed(void *parsed_result,
+               __rte_unused struct cmdline *cl,
+               __rte_unused void *data)
+{
+       struct cmd_show_rx_queue_desc_used_count_result *res = parsed_result;
+       int rc;
+
+       if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
+               printf("invalid port id %u\n", res->cmd_pid);
+               return;
+       }
+
+       rc = rte_eth_rx_queue_count(res->cmd_pid, res->cmd_qid);
+       if (rc < 0) {
+               printf("Invalid queueid = %d\n", res->cmd_qid);
+               return;
+       }
+       printf("Used desc count = %d\n", rc);
+}
+
+cmdline_parse_token_string_t cmd_show_rx_queue_desc_used_count_show =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_show_rx_queue_desc_used_count_result,
+                cmd_show, "show");
+cmdline_parse_token_string_t cmd_show_rx_queue_desc_used_count_port =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_show_rx_queue_desc_used_count_result,
+                cmd_port, "port");
+cmdline_parse_token_num_t cmd_show_rx_queue_desc_used_count_pid =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_show_rx_queue_desc_used_count_result,
+                cmd_pid, RTE_UINT16);
+cmdline_parse_token_string_t cmd_show_rx_queue_desc_used_count_rxq =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_show_rx_queue_desc_used_count_result,
+                cmd_rxq, "rxq");
+cmdline_parse_token_num_t cmd_show_rx_queue_desc_used_count_qid =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_show_rx_queue_desc_used_count_result,
+                cmd_qid, RTE_UINT16);
+cmdline_parse_token_string_t cmd_show_rx_queue_desc_used_count_desc =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_show_rx_queue_desc_used_count_result,
+                cmd_count, "desc");
+cmdline_parse_token_string_t cmd_show_rx_queue_desc_used_count_used =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_show_rx_queue_desc_used_count_result,
+                cmd_count, "used");
+cmdline_parse_token_string_t cmd_show_rx_queue_desc_used_count_count =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_show_rx_queue_desc_used_count_result,
+                cmd_count, "count");
+cmdline_parse_inst_t cmd_show_rx_queue_desc_used_count = {
+       .f = cmd_show_rx_queue_desc_used_count_parsed,
+       .data = NULL,
+       .help_str = "show port <port_id> rxq <queue_id> desc used count",
+       .tokens = {
+               (void *)&cmd_show_rx_queue_desc_used_count_show,
+               (void *)&cmd_show_rx_queue_desc_used_count_port,
+               (void *)&cmd_show_rx_queue_desc_used_count_pid,
+               (void *)&cmd_show_rx_queue_desc_used_count_rxq,
+               (void *)&cmd_show_rx_queue_desc_used_count_qid,
+               (void *)&cmd_show_rx_queue_desc_used_count_desc,
+               (void *)&cmd_show_rx_queue_desc_used_count_used,
+               (void *)&cmd_show_rx_queue_desc_used_count_count,
+               NULL,
+       },
+};
+
 /* Common result structure for set port ptypes */
 struct cmd_set_port_ptypes_result {
        cmdline_fixed_string_t set;
@@ -16671,7 +17163,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,
@@ -16679,7 +17171,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(
@@ -16764,7 +17256,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");
@@ -16939,9 +17431,9 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_enable_port_meter,
        (cmdline_parse_inst_t *)&cmd_disable_port_meter,
        (cmdline_parse_inst_t *)&cmd_del_port_meter,
+       (cmdline_parse_inst_t *)&cmd_del_port_meter_policy,
        (cmdline_parse_inst_t *)&cmd_set_port_meter_profile,
        (cmdline_parse_inst_t *)&cmd_set_port_meter_dscp_table,
-       (cmdline_parse_inst_t *)&cmd_set_port_meter_policer_action,
        (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,
@@ -16987,6 +17479,8 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_set_mplsoudp_encap_with_vlan,
        (cmdline_parse_inst_t *)&cmd_set_mplsoudp_decap,
        (cmdline_parse_inst_t *)&cmd_set_mplsoudp_decap_with_vlan,
+       (cmdline_parse_inst_t *)&cmd_set_conntrack_common,
+       (cmdline_parse_inst_t *)&cmd_set_conntrack_dir,
        (cmdline_parse_inst_t *)&cmd_ddp_add,
        (cmdline_parse_inst_t *)&cmd_ddp_del,
        (cmdline_parse_inst_t *)&cmd_ddp_get_list,
@@ -17049,6 +17543,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_config_tx_metadata_specific,
        (cmdline_parse_inst_t *)&cmd_show_tx_metadata,
        (cmdline_parse_inst_t *)&cmd_show_rx_tx_desc_status,
+       (cmdline_parse_inst_t *)&cmd_show_rx_queue_desc_used_count,
        (cmdline_parse_inst_t *)&cmd_set_raw,
        (cmdline_parse_inst_t *)&cmd_show_set_raw,
        (cmdline_parse_inst_t *)&cmd_show_set_raw_all,
@@ -17084,6 +17579,7 @@ cmdline_read_from_file(const char *filename)
 void
 prompt(void)
 {
+       int ret;
        /* initialize non-constant commands */
        cmd_set_fwd_mode_init();
        cmd_set_fwd_retry_mode_init();
@@ -17091,15 +17587,23 @@ prompt(void)
        testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
        if (testpmd_cl == NULL)
                return;
+
+       ret = atexit(prompt_exit);
+       if (ret != 0)
+               printf("Cannot set exit function for cmdline\n");
+
        cmdline_interact(testpmd_cl);
-       cmdline_stdin_exit(testpmd_cl);
+       if (ret != 0)
+               cmdline_stdin_exit(testpmd_cl);
 }
 
 void
 prompt_exit(void)
 {
-       if (testpmd_cl != NULL)
+       if (testpmd_cl != NULL) {
                cmdline_quit(testpmd_cl);
+               cmdline_stdin_exit(testpmd_cl);
+       }
 }
 
 static void