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 6A76CA0524 for ; Thu, 4 Feb 2021 12:30:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4BAE2240732; Thu, 4 Feb 2021 12:30:26 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 2256524072C for ; Thu, 4 Feb 2021 12:30:25 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cq6-00053H-0w; Thu, 04 Feb 2021 11:30:22 +0000 From: Christian Ehrhardt To: Ferruh Yigit Cc: Steven Webster , dpdk stable Date: Thu, 4 Feb 2021 12:27:44 +0100 Message-Id: <20210204112954.2488123-9-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/avp: remove always true condition' has been queued to stable release 19.11.7 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/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/3d155a95ebb1fd92756035a65b01f84a882d12a4 Thanks. Christian Ehrhardt --- >From 3d155a95ebb1fd92756035a65b01f84a882d12a4 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 19 Nov 2020 11:59:00 +0000 Subject: [PATCH] net/avp: remove always true condition [ upstream commit e6b87501657e681f15b48837fdfcffabc0ed6bef ] There is already a break above for the case "count >= 1", so at this stage 'count' should be always '0'. Fixes: 1a85922369c4 ("net/avp: add device configuration") Signed-off-by: Ferruh Yigit Acked-by: Steven Webster --- drivers/net/avp/avp_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c index 1abe96ce50..8de05ec16f 100644 --- a/drivers/net/avp/avp_ethdev.c +++ b/drivers/net/avp/avp_ethdev.c @@ -269,7 +269,7 @@ avp_dev_process_request(struct avp_dev *avp, struct rte_avp_request *request) break; } - if ((count < 1) && (retry == 0)) { + if (retry == 0) { PMD_DRV_LOG(ERR, "Timeout while waiting for a response for %u\n", request->req_id); ret = -ETIME; -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:28.578281469 +0100 +++ 0009-net-avp-remove-always-true-condition.patch 2021-02-04 12:04:27.810789516 +0100 @@ -1 +1 @@ -From e6b87501657e681f15b48837fdfcffabc0ed6bef Mon Sep 17 00:00:00 2001 +From 3d155a95ebb1fd92756035a65b01f84a882d12a4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e6b87501657e681f15b48837fdfcffabc0ed6bef ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 5f8187b905..f531e03c02 100644 +index 1abe96ce50..8de05ec16f 100644 @@ -22 +23 @@ -@@ -267,7 +267,7 @@ avp_dev_process_request(struct avp_dev *avp, struct rte_avp_request *request) +@@ -269,7 +269,7 @@ avp_dev_process_request(struct avp_dev *avp, struct rte_avp_request *request)