app/testpmd: fix variable use before null check

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

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 2ab03c1..5a10c5f 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -44,7 +44,6 @@
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
 #include <rte_devargs.h>
-#include <rte_eth_ctrl.h>
 #include <rte_flow.h>
 #include <rte_gro.h>
 
@@ -1440,17 +1439,17 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed)
                        return -1;
                }
                if (!strcmp(speedstr, "1000")) {
-                       *speed = ETH_LINK_SPEED_1G;
+                       *speed = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_FIXED;
                } else if (!strcmp(speedstr, "10000")) {
-                       *speed = ETH_LINK_SPEED_10G;
+                       *speed = ETH_LINK_SPEED_10G | ETH_LINK_SPEED_FIXED;
                } else if (!strcmp(speedstr, "25000")) {
-                       *speed = ETH_LINK_SPEED_25G;
+                       *speed = ETH_LINK_SPEED_25G | ETH_LINK_SPEED_FIXED;
                } else if (!strcmp(speedstr, "40000")) {
-                       *speed = ETH_LINK_SPEED_40G;
+                       *speed = ETH_LINK_SPEED_40G | ETH_LINK_SPEED_FIXED;
                } else if (!strcmp(speedstr, "50000")) {
-                       *speed = ETH_LINK_SPEED_50G;
+                       *speed = ETH_LINK_SPEED_50G | ETH_LINK_SPEED_FIXED;
                } else if (!strcmp(speedstr, "100000")) {
-                       *speed = ETH_LINK_SPEED_100G;
+                       *speed = ETH_LINK_SPEED_100G | ETH_LINK_SPEED_FIXED;
                } else if (!strcmp(speedstr, "auto")) {
                        *speed = ETH_LINK_SPEED_AUTONEG;
                } else {
@@ -18311,13 +18310,13 @@ search_tx_offload(const char *name)
        single_offload = 1;
        for (bit = 0; bit < sizeof(single_offload) * CHAR_BIT; bit++) {
                single_name = rte_eth_dev_tx_offload_name(single_offload);
+               if (single_name == NULL)
+                       break;
                if (!strcasecmp(single_name, name)) {
                        found = 1;
                        break;
                } else if (!strcasecmp(single_name, "UNKNOWN"))
                        break;
-               else if (single_name == NULL)
-                       break;
                single_offload <<= 1;
        }