From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EB856A0A02 for ; Mon, 17 May 2021 18:17:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6732410EA; Mon, 17 May 2021 18:17:12 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id A94EF410E0 for ; Mon, 17 May 2021 18:17:11 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifvZ-0008UY-O9; Mon, 17 May 2021 16:17:09 +0000 From: Christian Ehrhardt To: "Min Hu (Connor)" Cc: Haiyue Wang , dpdk stable Date: Mon, 17 May 2021 18:09:58 +0200 Message-Id: <20210517161039.3132619-169-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/e1000: fix flow error message object' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 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/19/21. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f5b78c208f7052afababb7b2fe4bb505b6d5d18c Thanks. Christian Ehrhardt --- >From f5b78c208f7052afababb7b2fe4bb505b6d5d18c Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Tue, 27 Apr 2021 16:51:21 +0800 Subject: [PATCH] net/e1000: fix flow error message object [ upstream commit 6705a69cee1db95a2ddf49e48b215da60f258174 ] This patch fixes parameter misuse when set rte flow action error. Fixes: c0688ef1eded ("net/igb: parse flow API n-tuple filter") Signed-off-by: Min Hu (Connor) Acked-by: Haiyue Wang --- drivers/net/e1000/igb_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c index 43fef889b5..63cb82660c 100644 --- a/drivers/net/e1000/igb_flow.c +++ b/drivers/net/e1000/igb_flow.c @@ -350,7 +350,7 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr, memset(filter, 0, sizeof(struct rte_eth_ntuple_filter)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, - item, "Not supported action."); + act, "Not supported action."); return -rte_errno; } filter->queue = -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.026100458 +0200 +++ 0169-net-e1000-fix-flow-error-message-object.patch 2021-05-17 17:40:29.495812029 +0200 @@ -1 +1 @@ -From 6705a69cee1db95a2ddf49e48b215da60f258174 Mon Sep 17 00:00:00 2001 +From f5b78c208f7052afababb7b2fe4bb505b6d5d18c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6705a69cee1db95a2ddf49e48b215da60f258174 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 33f6b1d6b3..e72376f69c 100644 +index 43fef889b5..63cb82660c 100644