From patchwork Tue Jul 7 09:40:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao1, Wei" X-Patchwork-Id: 73416 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 66380A00BE; Tue, 7 Jul 2020 12:06:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C5121DD7C; Tue, 7 Jul 2020 12:05:56 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 479AF1DD2A for ; Tue, 7 Jul 2020 12:05:55 +0200 (CEST) IronPort-SDR: hdvJ2XAxZFpT3a0G9wPpCVGSXignvE9M/PDKIMIKgqR/T0rzZNPv8mz0TQVvTc82hK9RMxfOyR gG+c9VX+jPLQ== X-IronPort-AV: E=McAfee;i="6000,8403,9674"; a="149075708" X-IronPort-AV: E=Sophos;i="5.75,323,1589266800"; d="scan'208";a="149075708" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2020 03:05:54 -0700 IronPort-SDR: WgdpHmCljbheSkkMoRqhXKRz5adIs29AFh9Qsx1kHMgZsUa0ZontCPafi2ek7GEYcBeAM+Hx3n lIfLUJdX5Lfw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,323,1589266800"; d="scan'208";a="268159340" Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([172.16.182.123]) by fmsmga008.fm.intel.com with ESMTP; 07 Jul 2020 03:05:53 -0700 From: Wei Zhao To: dev@dpdk.org Cc: qi.z.zhang@intel.com, nannan.lu@intel.com, Wei Zhao Date: Tue, 7 Jul 2020 17:40:47 +0800 Message-Id: <20200707094048.17690-2-wei.zhao1@intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200707094048.17690-1-wei.zhao1@intel.com> References: <20200707094048.17690-1-wei.zhao1@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] net/ice/base: fix tunnel type check for PPPoE 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" This patch fix tunnel type check for PPPoE type of recipe when search for recipe which has been created before, and also fix a bug of typo. Fixes: 418d2563d10b ("net/ice/base: get tunnel type for recipe") Signed-off-by: Wei Zhao --- drivers/net/ice/base/ice_switch.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 0e220580a..caa080da2 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -1086,15 +1086,11 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid) tun_type = ICE_SW_TUN_PPPOE; else if (!non_tun_valid && gtp_valid) tun_type = ICE_SW_TUN_GTP; - else if ((non_tun_valid && vxlan_valid) || - (non_tun_valid && gre_valid) || - (non_tun_valid && gtp_valid) || - (non_tun_valid && pppoe_valid)) + else if (non_tun_valid && + (vxlan_valid || gre_valid || gtp_valid || pppoe_valid)) tun_type = ICE_SW_TUN_AND_NON_TUN; - else if ((non_tun_valid && !vxlan_valid) || - (non_tun_valid && !gre_valid) || - (non_tun_valid && !gtp_valid) || - (non_tun_valid && !pppoe_valid)) + else if (non_tun_valid && !vxlan_valid && !gre_valid && !gtp_valid && + !pppoe_valid) tun_type = ICE_NON_TUN; if (profile_num > 1 && tun_type == ICE_SW_TUN_PPPOE) { @@ -1108,7 +1104,7 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid) tun_type = ICE_SW_TUN_PPPOE_IPV6; } - if (profile_num == 1 && (flag_valid || non_tun_valid)) { + if (profile_num == 1 && (flag_valid || non_tun_valid || pppoe_valid)) { for (j = 0; j < ICE_MAX_NUM_PROFILES; j++) { if (ice_is_bit_set(recipe_to_profile[rid], j)) { switch (j) {