From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 672B1A0093
for <public@inbox.dpdk.org>; Tue, 19 May 2020 15:07:54 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 5DA951D603;
Tue, 19 May 2020 15:07:54 +0200 (CEST)
Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com
[209.85.128.68]) by dpdk.org (Postfix) with ESMTP id CDD391D67D
for <stable@dpdk.org>; Tue, 19 May 2020 15:07:53 +0200 (CEST)
Received: by mail-wm1-f68.google.com with SMTP id z72so3497075wmc.2
for <stable@dpdk.org>; Tue, 19 May 2020 06:07:53 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=QS4xlrTNlGJVtt7Eg01m8pZ9xOwOD496MqY80QTZsEo=;
b=t+AcA/N8l1jPMSRQbwkVheXvR/QolGyWwuGCBhefa09qfr9Fy17Mqt7d5u7bqFfAas
30CEzPFSybIs8GyeU6C/pWAytg6XJjieKcEhRoDktX9NHh7TGj5AThZUW4gSFACLwsT+
51OGGybX1iuY0Our7DlQQy4zIKVTmhxnpa6t8VBB8zhzSCEYBpCJftQI6i5RKmjLfUoW
/GCV/Wiey0REuA0o6NGKHyBudl/BBd/FW/s/OiF2EyflV1xaM+P4YIB5p/O1n4XTps1A
QVLpxIkPf4zeFAdI13J0U1rIRved2u+zfLZVFSpeGREMtdSxdUuiN2v7s6Ej1i4ier2Y
VKRQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=QS4xlrTNlGJVtt7Eg01m8pZ9xOwOD496MqY80QTZsEo=;
b=bU0obPbKVDLNA4yp6HoqJCDfLTDMuFjQYLlYSUfFyAlqgfppswZzRFRkJFNoEz0EGC
UzJfvkFrF/CETfIuRL1FI9gnEPw7YpSNICRQN+dVx1iX2OYPQBMAmM4CTGzonW3Aeh8/
j+nh8Rl4o6rLWmOTQg2UA7kW14VyhLaMtgp9yeKVrz9RuYp5PZYpQzgIFDNAiBF39/U5
/9/WWkj9+eXMXhRoN/nj5bmnpfE3JLXhoWz1C8j3F9idqo7HpGVUqlbkvSpUvri5pTRK
UmxE5PsKeBjfnWxDUK2W34WX0iyD5bpFvsEtHjiumEiwSVczF6qZY0laONItVHY7bLwc
YXWg==
X-Gm-Message-State: AOAM531gz2TtpmZzYPkJczK184nG4J5JE73I/e7xgdyRwEzkmxx1csa5
NlkTrUxwEl/w0eq6TzAeFBU=
X-Google-Smtp-Source: ABdhPJz24O7qbqxHk4Tp2Oqic1gNX8F1mMVYOkVPXyJwa1HOmJBhcjEmJ+Z0XXQRGvGrMK2+gr6dYA==
X-Received: by 2002:a1c:2186:: with SMTP id h128mr5165416wmh.108.1589893672648;
Tue, 19 May 2020 06:07:52 -0700 (PDT)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id 32sm21835869wrr.38.2020.05.19.06.07.51
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 May 2020 06:07:52 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Wei Zhao <wei.zhao1@intel.com>
Cc: Qi Zhang <qi.z.zhang@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Tue, 19 May 2020 14:02:54 +0100
Message-Id: <20200519130549.112823-39-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com>
References: <20200519125804.104349-1-luca.boccassi@gmail.com>
<20200519130549.112823-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/ice: change default tunnel type' has been
queued to stable release 19.11.3
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Thanks.
Luca Boccassi
---
>From 1b23b24565c49869d9a750633a0dd96bb95f33ff Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Fri, 3 Apr 2020 12:46:01 +0800
Subject: [PATCH] net/ice: change default tunnel type
[ upstream commit 6bc7628c5e0b9c15dd2784bdf45546e8284d6f68 ]
The default tunnel type for switch filter change to new
definition of ICE_SW_TUN_AND_NON_TUN in order that the rule
will be apply to more packet type.
Fixes: 47d460d63233 ("net/ice: rework switch filter")
Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/ice/ice_switch_filter.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 66dc158efc..1db3db43c2 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1015,7 +1015,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
uint16_t lkups_num = 0;
const struct rte_flow_item *item = pattern;
uint16_t item_num = 0;
- enum ice_sw_tunnel_type tun_type = ICE_NON_TUN;
+ enum ice_sw_tunnel_type tun_type =
+ ICE_SW_TUN_AND_NON_TUN;
struct ice_pattern_match_item *pattern_match_item = NULL;
for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-05-19 14:04:46.160608286 +0100
+++ 0039-net-ice-change-default-tunnel-type.patch 2020-05-19 14:04:44.176647647 +0100
@@ -1,14 +1,15 @@
-From 6bc7628c5e0b9c15dd2784bdf45546e8284d6f68 Mon Sep 17 00:00:00 2001
+From 1b23b24565c49869d9a750633a0dd96bb95f33ff Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Fri, 3 Apr 2020 12:46:01 +0800
Subject: [PATCH] net/ice: change default tunnel type
+[ upstream commit 6bc7628c5e0b9c15dd2784bdf45546e8284d6f68 ]
+
The default tunnel type for switch filter change to new
definition of ICE_SW_TUN_AND_NON_TUN in order that the rule
will be apply to more packet type.
Fixes: 47d460d63233 ("net/ice: rework switch filter")
-Cc: stable@dpdk.org
Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
@@ -17,10 +18,10 @@
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
-index ed02d9805c..d9bdf9637e 100644
+index 66dc158efc..1db3db43c2 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
-@@ -1091,7 +1091,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
+@@ -1015,7 +1015,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
uint16_t lkups_num = 0;
const struct rte_flow_item *item = pattern;
uint16_t item_num = 0;