From patchwork Tue Mar 28 09:28:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xing, Beilei" X-Patchwork-Id: 22576 X-Patchwork-Delegate: ferruh.yigit@amd.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 21CACD287; Tue, 28 Mar 2017 11:30:07 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id BDE68D21F for ; Tue, 28 Mar 2017 11:29:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490693392; x=1522229392; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=EStBNUG4fhZQz7ttby8mzlBg3ju7S7CWewjDbSARv90=; b=jVyUtC7nRJ5UnQt3I851N+vHhoSis84/hDJ9bZsdicWpGw+HOQGyo4+H 2uP307H/oAUEayhDsknfxTazT41ZBg==; Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Mar 2017 02:29:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,236,1486454400"; d="scan'208";a="241154832" Received: from unknown (HELO dpdk9.sh.intel.com) ([10.239.129.31]) by fmsmga004.fm.intel.com with ESMTP; 28 Mar 2017 02:29:51 -0700 From: Beilei Xing To: jingjing.wu@intel.com Cc: helin.zhang@intel.com, bernard.iremonger@intel.com, dev@dpdk.org Date: Tue, 28 Mar 2017 17:28:42 +0800 Message-Id: <1490693324-83912-3-git-send-email-beilei.xing@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1490693324-83912-1-git-send-email-beilei.xing@intel.com> References: <1490671437-11334-1-git-send-email-beilei.xing@intel.com> <1490693324-83912-1-git-send-email-beilei.xing@intel.com> Subject: [dpdk-dev] [PATCH v4 2/4] net/i40e: change tunnel filter function name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Change tunnel filter function name to VXLAN filter function, prepare for other tunnel filter function. Signed-off-by: Beilei Xing --- drivers/net/i40e/i40e_flow.c | 58 ++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 4e3abf7..b535555 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -90,10 +90,6 @@ static int i40e_flow_parse_fdir_action(struct rte_eth_dev *dev, const struct rte_flow_action *actions, struct rte_flow_error *error, struct rte_eth_fdir_filter *filter); -static int i40e_flow_parse_tunnel_pattern(__rte_unused struct rte_eth_dev *dev, - const struct rte_flow_item *pattern, - struct rte_flow_error *error, - struct rte_eth_tunnel_filter_conf *filter); static int i40e_flow_parse_tunnel_action(struct rte_eth_dev *dev, const struct rte_flow_action *actions, struct rte_flow_error *error, @@ -112,12 +108,12 @@ static int i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, const struct rte_flow_action actions[], struct rte_flow_error *error, union i40e_filter_t *filter); -static int i40e_flow_parse_tunnel_filter(struct rte_eth_dev *dev, - const struct rte_flow_attr *attr, - const struct rte_flow_item pattern[], - const struct rte_flow_action actions[], - struct rte_flow_error *error, - union i40e_filter_t *filter); +static int i40e_flow_parse_vxlan_filter(struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow_error *error, + union i40e_filter_t *filter); static int i40e_flow_destroy_ethertype_filter(struct i40e_pf *pf, struct i40e_ethertype_filter *filter); static int i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf, @@ -302,11 +298,11 @@ static struct i40e_valid_pattern i40e_supported_patterns[] = { { pattern_fdir_ipv6_tcp_ext, i40e_flow_parse_fdir_filter }, { pattern_fdir_ipv6_sctp, i40e_flow_parse_fdir_filter }, { pattern_fdir_ipv6_sctp_ext, i40e_flow_parse_fdir_filter }, - /* tunnel */ - { pattern_vxlan_1, i40e_flow_parse_tunnel_filter }, - { pattern_vxlan_2, i40e_flow_parse_tunnel_filter }, - { pattern_vxlan_3, i40e_flow_parse_tunnel_filter }, - { pattern_vxlan_4, i40e_flow_parse_tunnel_filter }, + /* VXLAN */ + { pattern_vxlan_1, i40e_flow_parse_vxlan_filter }, + { pattern_vxlan_2, i40e_flow_parse_vxlan_filter }, + { pattern_vxlan_3, i40e_flow_parse_vxlan_filter }, + { pattern_vxlan_4, i40e_flow_parse_vxlan_filter }, }; #define NEXT_ITEM_OF_ACTION(act, actions, index) \ @@ -1205,7 +1201,8 @@ i40e_check_tenant_id_mask(const uint8_t *mask) * filled with 0. */ static int -i40e_flow_parse_vxlan_pattern(const struct rte_flow_item *pattern, +i40e_flow_parse_vxlan_pattern(__rte_unused struct rte_eth_dev *dev, + const struct rte_flow_item *pattern, struct rte_flow_error *error, struct rte_eth_tunnel_filter_conf *filter) { @@ -1469,32 +1466,19 @@ i40e_flow_parse_vxlan_pattern(const struct rte_flow_item *pattern, } static int -i40e_flow_parse_tunnel_pattern(__rte_unused struct rte_eth_dev *dev, - const struct rte_flow_item *pattern, - struct rte_flow_error *error, - struct rte_eth_tunnel_filter_conf *filter) -{ - int ret; - - ret = i40e_flow_parse_vxlan_pattern(pattern, error, filter); - - return ret; -} - -static int -i40e_flow_parse_tunnel_filter(struct rte_eth_dev *dev, - const struct rte_flow_attr *attr, - const struct rte_flow_item pattern[], - const struct rte_flow_action actions[], - struct rte_flow_error *error, - union i40e_filter_t *filter) +i40e_flow_parse_vxlan_filter(struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow_error *error, + union i40e_filter_t *filter) { struct rte_eth_tunnel_filter_conf *tunnel_filter = &filter->tunnel_filter; int ret; - ret = i40e_flow_parse_tunnel_pattern(dev, pattern, - error, tunnel_filter); + ret = i40e_flow_parse_vxlan_pattern(dev, pattern, + error, tunnel_filter); if (ret) return ret;