From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 7DDB71B49D for ; Fri, 4 Jan 2019 14:27:34 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DEAE87DD26; Fri, 4 Jan 2019 13:27:33 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF8355C1A1; Fri, 4 Jan 2019 13:27:32 +0000 (UTC) From: Kevin Traynor To: Jeff Shaw Cc: Bruce Richardson , dpdk stable Date: Fri, 4 Jan 2019 13:24:22 +0000 Message-Id: <20190104132455.15170-40-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 04 Jan 2019 13:27:33 +0000 (UTC) Subject: [dpdk-stable] patch 'hash: fix return of bulk lookup' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2019 13:27:34 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/11/19. 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. Kevin Traynor --- >>From cf868c33095de279e2d247e700aa5a336d581f0e Mon Sep 17 00:00:00 2001 From: Jeff Shaw Date: Fri, 7 Dec 2018 16:01:26 -0800 Subject: [PATCH] hash: fix return of bulk lookup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 0f48ca429bc7a816a6fb8a0d9bd119fe0471788c ] The __rte_hash_lookup_bulk() function returns void, and therefore should not return with an expression. This commit fixes the following compiler warning when attempting to compile with "-pedantic -std=c11". warning: ISO C forbids ‘return’ with expression, in function returning void [-Wpedantic] Fixes: 9eca8bd7a61c ("hash: separate lock-free and r/w lock lookup") Signed-off-by: Jeff Shaw Acked-by: Bruce Richardson --- lib/librte_hash/rte_cuckoo_hash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c index c55a4f263..7e6c139d3 100644 --- a/lib/librte_hash/rte_cuckoo_hash.c +++ b/lib/librte_hash/rte_cuckoo_hash.c @@ -2023,9 +2023,9 @@ __rte_hash_lookup_bulk(const struct rte_hash *h, const void **keys, { if (h->readwrite_concur_lf_support) - return __rte_hash_lookup_bulk_lf(h, keys, num_keys, - positions, hit_mask, data); + __rte_hash_lookup_bulk_lf(h, keys, num_keys, positions, + hit_mask, data); else - return __rte_hash_lookup_bulk_l(h, keys, num_keys, - positions, hit_mask, data); + __rte_hash_lookup_bulk_l(h, keys, num_keys, positions, + hit_mask, data); } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:08.401127981 +0000 +++ 0040-hash-fix-return-of-bulk-lookup.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,4 +1,4 @@ -From 0f48ca429bc7a816a6fb8a0d9bd119fe0471788c Mon Sep 17 00:00:00 2001 +From cf868c33095de279e2d247e700aa5a336d581f0e Mon Sep 17 00:00:00 2001 From: Jeff Shaw Date: Fri, 7 Dec 2018 16:01:26 -0800 Subject: [PATCH] hash: fix return of bulk lookup @@ -6,6 +6,8 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[ upstream commit 0f48ca429bc7a816a6fb8a0d9bd119fe0471788c ] + The __rte_hash_lookup_bulk() function returns void, and therefore should not return with an expression. This commit fixes the following compiler warning when attempting to compile with "-pedantic -std=c11". @@ -14,7 +16,6 @@ returning void [-Wpedantic] Fixes: 9eca8bd7a61c ("hash: separate lock-free and r/w lock lookup") -Cc: stable@dpdk.org Signed-off-by: Jeff Shaw Acked-by: Bruce Richardson