From 01c5e0044f95fbc7213ce9dac1ecb82277286f15 Mon Sep 17 00:00:00 2001 From: Jingjing Wu Date: Wed, 23 Mar 2016 21:07:12 +0800 Subject: [PATCH] app/testpmd: add VLAN in flow director input set This patch extends the commands for changing flow director filter's input set. It adds vlan as a possible filter input field. Signed-off-by: Jingjing Wu Acked-by: Helin Zhang --- app/test-pmd/cmdline.c | 6 +++--- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 95350deb76..25b87ca92d 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -774,7 +774,7 @@ static void cmd_help_long_parsed(void *parsed_result, "set_fdir_input_set (port_id) " "(ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|" "ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|" - "l2_payload) (ethertype|src-ipv4|dst-ipv4|src-ipv6|" + "l2_payload) (ivlan|ethertype|src-ipv4|dst-ipv4|src-ipv6|" "dst-ipv6|ipv4-tos|ipv4-proto|ipv4-ttl|ipv6-tc|" "ipv6-next-header|ipv6-hop-limits|udp-src-port|" "udp-dst-port|tcp-src-port|tcp-dst-port|" @@ -9651,7 +9651,7 @@ cmdline_parse_token_string_t cmd_set_fdir_input_set_flow_type = cmdline_parse_token_string_t cmd_set_fdir_input_set_field = TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result, inset_field, - "ethertype#src-ipv4#dst-ipv4#src-ipv6#dst-ipv6#" + "ivlan#ethertype#src-ipv4#dst-ipv4#src-ipv6#dst-ipv6#" "ipv4-tos#ipv4-proto#ipv4-ttl#ipv6-tc#ipv6-next-header#" "ipv6-hop-limits#udp-src-port#udp-dst-port#" "tcp-src-port#tcp-dst-port#sctp-src-port#sctp-dst-port#" @@ -9666,7 +9666,7 @@ cmdline_parse_inst_t cmd_set_fdir_input_set = { .help_str = "set_fdir_input_set " "ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|" "ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|l2_payload " - "ethertype|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|" + "ivlan|ethertype|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|" "ipv4-tos|ipv4-proto|ipv4-ttl|ipv6-tc|ipv6-next-header|" "ipv6-hop-limits|udp-src-port|udp-dst-port|" "tcp-src-port|tcp-dst-port|sctp-src-port|sctp-dst-port|" diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 52a4f11249..94fba6abf0 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -1929,7 +1929,7 @@ Set the input set for flow director:: set_fdir_input_set (port_id) (ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp| \ ipv4-other|ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other| \ - l2_payload) (ethertype|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|ipv4-tos| \ + l2_payload) (ivlan|ethertype|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|ipv4-tos| \ ipv4-proto|ipv4-ttl|ipv6-tc|ipv6-next-header|ipv6-hop-limits| \ tudp-src-port|udp-dst-port|cp-src-port|tcp-dst-port|sctp-src-port| \ sctp-dst-port|sctp-veri-tag|none) (select|add) -- 2.20.1