tailq: remove unneeded inclusions

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

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index c8312be..a15cbf2 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -61,7 +61,6 @@
 #include <rte_memzone.h>
 #include <rte_malloc.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -530,7 +529,8 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port config all max-pkt-len (value)\n"
                        "    Set the max packet length.\n\n"
 
-                       "port config all (crc-strip|rx-cksum|hw-vlan|drop-en)"
+                       "port config all (crc-strip|rx-cksum|hw-vlan|hw-vlan-filter|"
+                       "hw-vlan-strip|hw-vlan-extend|drop-en)"
                        " (on|off)\n"
                        "    Set crc-strip/rx-checksum/hardware-vlan/drop_en"
                        " for ports.\n\n"
@@ -1343,6 +1343,33 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
                        printf("Unknown parameter\n");
                        return;
                }
+       } else if (!strcmp(res->name, "hw-vlan-filter")) {
+               if (!strcmp(res->value, "on"))
+                       rx_mode.hw_vlan_filter = 1;
+               else if (!strcmp(res->value, "off"))
+                       rx_mode.hw_vlan_filter = 0;
+               else {
+                       printf("Unknown parameter\n");
+                       return;
+               }
+       } else if (!strcmp(res->name, "hw-vlan-strip")) {
+               if (!strcmp(res->value, "on"))
+                       rx_mode.hw_vlan_strip  = 1;
+               else if (!strcmp(res->value, "off"))
+                       rx_mode.hw_vlan_strip  = 0;
+               else {
+                       printf("Unknown parameter\n");
+                       return;
+               }
+       } else if (!strcmp(res->name, "hw-vlan-extend")) {
+               if (!strcmp(res->value, "on"))
+                       rx_mode.hw_vlan_extend = 1;
+               else if (!strcmp(res->value, "off"))
+                       rx_mode.hw_vlan_extend = 0;
+               else {
+                       printf("Unknown parameter\n");
+                       return;
+               }
        } else if (!strcmp(res->name, "drop-en")) {
                if (!strcmp(res->value, "on"))
                        rx_drop_en = 1;
@@ -1371,7 +1398,8 @@ cmdline_parse_token_string_t cmd_config_rx_mode_flag_all =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_mode_flag, all, "all");
 cmdline_parse_token_string_t cmd_config_rx_mode_flag_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_mode_flag, name,
-                                       "crc-strip#rx-cksum#hw-vlan");
+                                       "crc-strip#rx-cksum#hw-vlan#"
+                                       "hw-vlan-filter#hw-vlan-strip#hw-vlan-extend");
 cmdline_parse_token_string_t cmd_config_rx_mode_flag_value =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_mode_flag, value,
                                                        "on#off");
@@ -1379,7 +1407,8 @@ cmdline_parse_token_string_t cmd_config_rx_mode_flag_value =
 cmdline_parse_inst_t cmd_config_rx_mode_flag = {
        .f = cmd_config_rx_mode_flag_parsed,
        .data = NULL,
-       .help_str = "port config all crc-strip|rx-cksum|hw-vlan on|off",
+       .help_str = "port config all crc-strip|rx-cksum|hw-vlan|"
+               "hw-vlan-filter|hw-vlan-strip|hw-vlan-extend on|off",
        .tokens = {
                (void *)&cmd_config_rx_mode_flag_port,
                (void *)&cmd_config_rx_mode_flag_keyword,
@@ -4050,6 +4079,7 @@ static void cmd_create_bonded_device_parsed(void *parsed_result,
                nb_ports = rte_eth_dev_count();
                reconfig(port_id, res->socket);
                rte_eth_promiscuous_enable(port_id);
+               ports[port_id].enabled = 1;
        }
 
 }