Merge branch 'upstream-16.11-stable' into 16.11.x

[deb_dpdk.git] / app / test-pmd / cmdline.c

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 63b55dc..7dbe245 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1568,7 +1568,7 @@ cmd_config_rss_parsed(void *parsed_result,
                        __attribute__((unused)) void *data)
 {
        struct cmd_config_rss *res = parsed_result;
-       struct rte_eth_rss_conf rss_conf;
+       struct rte_eth_rss_conf rss_conf = { .rss_key_len = 0, };
        int diag;
        uint8_t i;
 
@@ -1840,7 +1840,7 @@ cmdline_parse_inst_t cmd_config_rxtx_queue = {
        .data = NULL,
        .help_str = "port X rxq|txq ID start|stop",
        .tokens = {
-               (void *)&cmd_config_speed_all_port,
+               (void *)&cmd_config_rxtx_queue_port,
                (void *)&cmd_config_rxtx_queue_portid,
                (void *)&cmd_config_rxtx_queue_rxtxq,
                (void *)&cmd_config_rxtx_queue_qid,
@@ -8387,11 +8387,11 @@ struct cmd_flow_director_result {
        uint16_t port_dst;
        cmdline_fixed_string_t verify_tag;
        uint32_t verify_tag_value;
-       cmdline_ipaddr_t tos;
+       cmdline_fixed_string_t tos;
        uint8_t tos_value;
-       cmdline_ipaddr_t proto;
+       cmdline_fixed_string_t proto;
        uint8_t proto_value;
-       cmdline_ipaddr_t ttl;
+       cmdline_fixed_string_t ttl;
        uint8_t ttl_value;
        cmdline_fixed_string_t vlan;
        uint16_t vlan_value;
@@ -8923,7 +8923,7 @@ cmdline_parse_inst_t cmd_add_del_sctp_flow_director = {
                (void *)&cmd_flow_director_flow_type,
                (void *)&cmd_flow_director_src,
                (void *)&cmd_flow_director_ip_src,
-               (void *)&cmd_flow_director_port_dst,
+               (void *)&cmd_flow_director_port_src,
                (void *)&cmd_flow_director_dst,
                (void *)&cmd_flow_director_ip_dst,
                (void *)&cmd_flow_director_port_dst,
@@ -10807,6 +10807,9 @@ cmd_set_vf_vlan_anti_spoof_parsed(
        int ret = 0;
        int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
 
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
        ret = rte_pmd_ixgbe_set_vf_vlan_anti_spoof(res->port_id, res->vf_id,
                        is_on);
        switch (ret) {
@@ -10892,6 +10895,9 @@ cmd_set_vf_mac_anti_spoof_parsed(
        int ret;
        int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
 
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
        ret = rte_pmd_ixgbe_set_vf_mac_anti_spoof(res->port_id, res->vf_id,
                        is_on);
        switch (ret) {
@@ -10977,6 +10983,9 @@ cmd_set_vf_vlan_stripq_parsed(
        int ret = 0;
        int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
 
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
        ret = rte_pmd_ixgbe_set_vf_vlan_stripq(res->port_id, res->vf_id, is_on);
        switch (ret) {
        case 0:
@@ -11060,6 +11069,9 @@ cmd_set_vf_vlan_insert_parsed(
        struct cmd_vf_vlan_insert_result *res = parsed_result;
        int ret;
 
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
        ret = rte_pmd_ixgbe_set_vf_vlan_insert(res->port_id, res->vf_id, res->vlan_id);
        switch (ret) {
        case 0:
@@ -11134,6 +11146,9 @@ cmd_set_tx_loopback_parsed(
        int ret;
        int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
 
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
        ret = rte_pmd_ixgbe_set_tx_loopback(res->port_id, is_on);
        switch (ret) {
        case 0:
@@ -11211,6 +11226,9 @@ cmd_set_all_queues_drop_en_parsed(
        int ret = 0;
        int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
 
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
        ret = rte_pmd_ixgbe_set_all_queues_drop_en(res->port_id, is_on);
        switch (ret) {
        case 0:
@@ -11294,6 +11312,9 @@ cmd_set_vf_split_drop_en_parsed(
        int ret;
        int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
 
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
        ret = rte_pmd_ixgbe_set_vf_split_drop_en(res->port_id, res->vf_id,
                        is_on);
        switch (ret) {
@@ -11378,6 +11399,9 @@ cmd_set_vf_mac_addr_parsed(
        struct cmd_set_vf_mac_addr_result *res = parsed_result;
        int ret;
 
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
        ret = rte_pmd_ixgbe_set_vf_mac_addr(res->port_id, res->vf_id,
                        &res->mac_addr);
        switch (ret) {