app/testpmd: remove unnecessary void casts

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

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b1b36c1..4f2d731 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -424,8 +424,8 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    Display the status of TCP Segmentation Offload.\n\n"
 
                        "gro (on|off) (port_id)"
-                       "    Enable or disable Generic Receive Offload in io"
-                       " forward engine.\n\n"
+                       "    Enable or disable Generic Receive Offload in"
+                       " csum forwarding engine.\n\n"
 
                        "gro set (max_flow_num) (max_item_num_per_flow) (port_id)\n"
                        "    Set max flow number and max packet number per-flow"
@@ -972,6 +972,8 @@ static void cmd_operate_port_parsed(void *parsed_result,
                stop_port(RTE_PORT_ALL);
        else if (!strcmp(res->name, "close"))
                close_port(RTE_PORT_ALL);
+       else if (!strcmp(res->name, "reset"))
+               reset_port(RTE_PORT_ALL);
        else
                printf("Unknown parameter\n");
 }
@@ -981,14 +983,14 @@ cmdline_parse_token_string_t cmd_operate_port_all_cmd =
                                                                "port");
 cmdline_parse_token_string_t cmd_operate_port_all_port =
        TOKEN_STRING_INITIALIZER(struct cmd_operate_port_result, name,
-                                               "start#stop#close");
+                                               "start#stop#close#reset");
 cmdline_parse_token_string_t cmd_operate_port_all_all =
        TOKEN_STRING_INITIALIZER(struct cmd_operate_port_result, value, "all");
 
 cmdline_parse_inst_t cmd_operate_port = {
        .f = cmd_operate_port_parsed,
        .data = NULL,
-       .help_str = "port start|stop|close all: Start/Stop/Close all ports",
+       .help_str = "port start|stop|close all: Start/Stop/Close/Reset all ports",
        .tokens = {
                (void *)&cmd_operate_port_all_cmd,
                (void *)&cmd_operate_port_all_port,
@@ -1016,6 +1018,8 @@ static void cmd_operate_specific_port_parsed(void *parsed_result,
                stop_port(res->value);
        else if (!strcmp(res->name, "close"))
                close_port(res->value);
+       else if (!strcmp(res->name, "reset"))
+               reset_port(res->value);
        else
                printf("Unknown parameter\n");
 }
@@ -1025,7 +1029,7 @@ cmdline_parse_token_string_t cmd_operate_specific_port_cmd =
                                                        keyword, "port");
 cmdline_parse_token_string_t cmd_operate_specific_port_port =
        TOKEN_STRING_INITIALIZER(struct cmd_operate_specific_port_result,
-                                               name, "start#stop#close");
+                                               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);
@@ -1033,7 +1037,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id =
 cmdline_parse_inst_t cmd_operate_specific_port = {
        .f = cmd_operate_specific_port_parsed,
        .data = NULL,
-       .help_str = "port start|stop|close <port_id>: Start/Stop/Close port_id",
+       .help_str = "port start|stop|close <port_id>: Start/Stop/Close/Reset port_id",
        .tokens = {
                (void *)&cmd_operate_specific_port_cmd,
                (void *)&cmd_operate_specific_port_port,
@@ -6960,7 +6964,7 @@ cmd_set_vf_macvlan_parsed(void *parsed_result,
 
        memset(&filter, 0, sizeof(struct rte_eth_mac_filter));
 
-       (void)rte_memcpy(&filter.mac_addr, &res->address, ETHER_ADDR_LEN);
+       rte_memcpy(&filter.mac_addr, &res->address, ETHER_ADDR_LEN);
 
        /* set VF MAC filter */
        filter.is_vf = 1;
@@ -7209,11 +7213,22 @@ static void cmd_vf_mac_addr_parsed(void *parsed_result,
                __attribute__((unused)) void *data)
 {
        struct cmd_vf_mac_addr_result *res = parsed_result;
-       int ret = 0;
+       int ret = -ENOTSUP;
+
+       if (strcmp(res->what, "add") != 0)
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_add_vf_mac_addr(res->port_num, res->vf_num,
+                                                  &res->address);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_mac_addr_add(res->port_num, &res->address,
+                                               res->vf_num);
+#endif
 
-       if (strcmp(res->what, "add") == 0)
-               ret = rte_eth_dev_mac_addr_add(res->port_num,
-                                       &res->address, res->vf_num);
        if(ret < 0)
                printf("vf_mac_addr_cmd error: (%s)\n", strerror(-ret));
 
@@ -8823,7 +8838,7 @@ cmd_ethertype_filter_parsed(void *parsed_result,
        memset(&filter, 0, sizeof(filter));
        if (!strcmp(res->mac, "mac_addr")) {
                filter.flags |= RTE_ETHTYPE_FLAGS_MAC;
-               (void)rte_memcpy(&filter.mac_addr, &res->mac_addr,
+               rte_memcpy(&filter.mac_addr, &res->mac_addr,
                        sizeof(struct ether_addr));
        }
        if (!strcmp(res->drop, "drop"))
@@ -9012,7 +9027,7 @@ do { \
 #define IPV6_ADDR_TO_ARRAY(ip_addr, ip) \
 do { \
        if ((ip_addr).family == AF_INET6) \
-               (void)rte_memcpy(&(ip), \
+               rte_memcpy(&(ip), \
                                 &((ip_addr).addr.ipv6), \
                                 sizeof(struct in6_addr)); \
        else { \
@@ -9144,12 +9159,12 @@ cmd_flow_director_filter_parsed(void *parsed_result,
        }
 
        if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_MAC_VLAN)
-               (void)rte_memcpy(&entry.input.flow.mac_vlan_flow.mac_addr,
+               rte_memcpy(&entry.input.flow.mac_vlan_flow.mac_addr,
                                 &res->mac_addr,
                                 sizeof(struct ether_addr));
 
        if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_TUNNEL) {
-               (void)rte_memcpy(&entry.input.flow.tunnel_flow.mac_addr,
+               rte_memcpy(&entry.input.flow.tunnel_flow.mac_addr,
                                 &res->mac_addr,
                                 sizeof(struct ether_addr));
                entry.input.flow.tunnel_flow.tunnel_type =
@@ -9158,7 +9173,7 @@ cmd_flow_director_filter_parsed(void *parsed_result,
                        rte_cpu_to_be_32(res->tunnel_id_value);
        }
 
-       (void)rte_memcpy(entry.input.flow_ext.flexbytes,
+       rte_memcpy(entry.input.flow_ext.flexbytes,
                   flexbytes,
                   RTE_ETH_FDIR_MAX_FLEXLEN);
 
@@ -9856,7 +9871,7 @@ cmd_flow_director_flex_mask_parsed(void *parsed_result,
                        memset(&port->dev_conf.fdir_conf.flex_conf.flex_mask[i],
                               0, sizeof(struct rte_eth_fdir_flex_mask));
                port->dev_conf.fdir_conf.flex_conf.nb_flexmasks = 1;
-               (void)rte_memcpy(&port->dev_conf.fdir_conf.flex_conf.flex_mask[0],
+               rte_memcpy(&port->dev_conf.fdir_conf.flex_conf.flex_mask[0],
                                 &flex_mask,
                                 sizeof(struct rte_eth_fdir_flex_mask));
                cmd_reconfig_device_queue(res->port_id, 1, 1);