ethdev: remove redundant id field in xstats name lookup

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

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index cb71c09..c5865f9 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -138,6 +138,11 @@ static const struct rss_type_info rss_type_table[] = {
        { "ipv6-ex", ETH_RSS_IPV6_EX },
        { "ipv6-tcp-ex", ETH_RSS_IPV6_TCP_EX },
        { "ipv6-udp-ex", ETH_RSS_IPV6_UDP_EX },
+       { "port", ETH_RSS_PORT },
+       { "vxlan", ETH_RSS_VXLAN },
+       { "geneve", ETH_RSS_GENEVE },
+       { "nvgre", ETH_RSS_NVGRE },
+
 };
 
 static void
@@ -256,7 +261,7 @@ void
 nic_xstats_display(portid_t port_id)
 {
        struct rte_eth_xstat *xstats;
-       int cnt_xstats, idx_xstat, idx_name;
+       int cnt_xstats, idx_xstat;
        struct rte_eth_xstat_name *xstats_names;
 
        printf("###### NIC extended statistics for port %-2d\n", port_id);
@@ -301,13 +306,9 @@ nic_xstats_display(portid_t port_id)
 
        /* Display xstats */
        for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++)
-               for (idx_name = 0; idx_name < cnt_xstats; idx_name++)
-                       if (xstats_names[idx_name].id == xstats[idx_xstat].id) {
-                               printf("%s: %"PRIu64"\n",
-                                       xstats_names[idx_name].name,
-                                       xstats[idx_xstat].value);
-                               break;
-                       }
+               printf("%s: %"PRIu64"\n",
+                       xstats_names[idx_xstat].name,
+                       xstats[idx_xstat].value);
        free(xstats_names);
        free(xstats);
 }
@@ -1231,6 +1232,10 @@ rss_fwd_config_setup(void)
        cur_fwd_config.nb_fwd_streams =
                (streamid_t) (nb_q * cur_fwd_config.nb_fwd_ports);
 
+       if (cur_fwd_config.nb_fwd_streams < cur_fwd_config.nb_fwd_lcores)
+               cur_fwd_config.nb_fwd_lcores =
+                       (lcoreid_t)cur_fwd_config.nb_fwd_streams;
+
        /* reinitialize forwarding streams */
        init_fwd_streams();
 
@@ -2119,6 +2124,10 @@ flowtype_to_str(uint16_t flow_type)
                {"ipv6-sctp", RTE_ETH_FLOW_NONFRAG_IPV6_SCTP},
                {"ipv6-other", RTE_ETH_FLOW_NONFRAG_IPV6_OTHER},
                {"l2_payload", RTE_ETH_FLOW_L2_PAYLOAD},
+               {"port", RTE_ETH_FLOW_PORT},
+               {"vxlan", RTE_ETH_FLOW_VXLAN},
+               {"geneve", RTE_ETH_FLOW_GENEVE},
+               {"nvgre", RTE_ETH_FLOW_NVGRE},
        };
 
        for (i = 0; i < RTE_DIM(flowtype_str_table); i++) {