From mboxrd@z Thu Jan 1 00:00:00 1970 From: Beilei Xing Subject: [PATCH 1/2] net/i40e: change tunnel filter function name Date: Fri, 3 Mar 2017 15:26:06 +0800 Message-ID: <1488525977-15321-2-git-send-email-beilei.xing@intel.com> References: <1488525977-15321-1-git-send-email-beilei.xing@intel.com> Cc: helin.zhang@intel.com, dev@dpdk.org To: jingjing.wu@intel.com Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id F252B952 for ; Fri, 3 Mar 2017 08:27:25 +0100 (CET) In-Reply-To: <1488525977-15321-1-git-send-email-beilei.xing@intel.com> 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 NVGRE filter function. Signed-off-by: Beilei Xing --- drivers/net/i40e/i40e_flow.c | 56 ++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index c6e4d87..d0ef4bc 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, @@ -303,10 +299,10 @@ static struct i40e_valid_pattern i40e_supported_patterns[] = { { 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 }, + { 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; -- 2.5.5