From patchwork Thu Jun 1 17:36:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 25013 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 C71D87CF5; Fri, 2 Jun 2017 02:43:29 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 1AA4A7CE3 for ; Fri, 2 Jun 2017 02:43:25 +0200 (CEST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Jun 2017 17:43:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,282,1493708400"; d="scan'208";a="93818925" Received: from zhangqi.sh.intel.com ([10.239.129.189]) by orsmga004.jf.intel.com with ESMTP; 01 Jun 2017 17:43:24 -0700 From: Qi Zhang To: wenzhuo.lu@intel.com, helin.zhang@intel.com Cc: dev@dpdk.org, Qi Zhang Date: Thu, 1 Jun 2017 13:36:43 -0400 Message-Id: <1496338605-7338-2-git-send-email-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496338605-7338-1-git-send-email-qi.z.zhang@intel.com> References: <1496259940-15547-1-git-send-email-qi.z.zhang@intel.com> <1496338605-7338-1-git-send-email-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH v3 1/3] net/ixgbe: remove reduandent code 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" Remove reduandent code. item->type != RTE_FLOW_ITEM_TYPE_END already cover item->type == RTE_FLOW_ITEM_TYPE_VLAN. Signed-off-by: Qi Zhang Acked-by: Wenzhuo Lu --- v3: -fix comments. drivers/net/ixgbe/ixgbe_flow.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index da7b1cc..60ca8d8 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -1544,18 +1544,10 @@ ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, rule->mask.vlan_tci_mask &= rte_cpu_to_be_16(0xEFFF); /* More than one tags are not supported. */ - /** - * Check if the next not void item is not vlan. - */ + /* Next not void item must be END */ index++; NEXT_ITEM_OF_PATTERN(item, pattern, index); - if (item->type == RTE_FLOW_ITEM_TYPE_VLAN) { - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, "Not supported by fdir filter"); - return -rte_errno; - } else if (item->type != RTE_FLOW_ITEM_TYPE_END) { + if (item->type != RTE_FLOW_ITEM_TYPE_END) { memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,