app/testpmd: simplify handling of stats mappings error

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

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index eb14cd3..3ff4f81 100644 (file)
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -316,14 +316,14 @@ parse_queue_stats_mapping_config(const char *q_arg, int is_rx)
                        return -1;
                }
 
-               if (is_rx ? (nb_rx_queue_stats_mappings >= MAX_RX_QUEUE_STATS_MAPPINGS) :
-                   (nb_tx_queue_stats_mappings >= MAX_TX_QUEUE_STATS_MAPPINGS)) {
-                       printf("exceeded max number of %s queue statistics mappings: %hu\n",
-                              is_rx ? "RX" : "TX",
-                              is_rx ? nb_rx_queue_stats_mappings : nb_tx_queue_stats_mappings);
-                       return -1;
-               }
                if (!is_rx) {
+                       if ((nb_tx_queue_stats_mappings >=
+                                               MAX_TX_QUEUE_STATS_MAPPINGS)) {
+                               printf("exceeded max number of TX queue "
+                                               "statistics mappings: %hu\n",
+                                               nb_tx_queue_stats_mappings);
+                               return -1;
+                       }
                        tx_queue_stats_mappings_array[nb_tx_queue_stats_mappings].port_id =
                                (uint8_t)int_fld[FLD_PORT];
                        tx_queue_stats_mappings_array[nb_tx_queue_stats_mappings].queue_id =
@@ -333,6 +333,13 @@ parse_queue_stats_mapping_config(const char *q_arg, int is_rx)
                        ++nb_tx_queue_stats_mappings;
                }
                else {
+                       if ((nb_rx_queue_stats_mappings >=
+                                               MAX_RX_QUEUE_STATS_MAPPINGS)) {
+                               printf("exceeded max number of RX queue "
+                                               "statistics mappings: %hu\n",
+                                               nb_rx_queue_stats_mappings);
+                               return -1;
+                       }
                        rx_queue_stats_mappings_array[nb_rx_queue_stats_mappings].port_id =
                                (uint8_t)int_fld[FLD_PORT];
                        rx_queue_stats_mappings_array[nb_rx_queue_stats_mappings].queue_id =
@@ -832,10 +839,9 @@ launch_args_parse(int argc, char** argv)
                        if (!strcmp(lgopts[opt_idx].name, "forward-mode"))
                                set_pkt_forwarding_mode(optarg);
                        if (!strcmp(lgopts[opt_idx].name, "rss-ip"))
-                               rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6;
+                               rss_hf = ETH_RSS_IP;
                        if (!strcmp(lgopts[opt_idx].name, "rss-udp"))
-                               rss_hf = ETH_RSS_IPV4 |
-                                               ETH_RSS_IPV6 | ETH_RSS_IPV4_UDP;
+                               rss_hf = ETH_RSS_UDP;
                        if (!strcmp(lgopts[opt_idx].name, "rxq")) {
                                n = atoi(optarg);
                                if (n >= 1 && n <= (int) MAX_QUEUE_ID)