From patchwork Tue Jan 26 06:26:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingjing Wu X-Patchwork-Id: 10092 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C13D5936E; Tue, 26 Jan 2016 07:26:53 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 295359384 for ; Tue, 26 Jan 2016 07:26:50 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 25 Jan 2016 22:26:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,348,1449561600"; d="scan'208";a="868723846" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 25 Jan 2016 22:26:50 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id u0Q6QkEX031408; Tue, 26 Jan 2016 14:26:46 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u0Q6QgfY006415; Tue, 26 Jan 2016 14:26:44 +0800 Received: (from wujingji@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id u0Q6Qg0A006411; Tue, 26 Jan 2016 14:26:42 +0800 From: Jingjing Wu To: dev@dpdk.org Date: Tue, 26 Jan 2016 14:26:15 +0800 Message-Id: <1453789575-6297-13-git-send-email-jingjing.wu@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1453789575-6297-1-git-send-email-jingjing.wu@intel.com> References: <1451032200-24973-1-git-send-email-jingjing.wu@intel.com> <1453789575-6297-1-git-send-email-jingjing.wu@intel.com> Subject: [dpdk-dev] [PATCH 12/12] testpmd: extend commands for fdir's vlan input set X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch extended commands for filter's input set changing. It added vlan as filter's input fields. Signed-off-by: Jingjing Wu --- 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 ecc822a..f7ffce1 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -748,7 +748,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|" @@ -9622,7 +9622,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#" @@ -9637,7 +9637,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 417ddde..aa20d5a 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -1878,7 +1878,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|udp-key|gre-key|none) (select|add)