[dpdk-stable] patch 'hash: fix return of bulk lookup' has been queued to LTS release 18.11.1

[Kevin Traynor]

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 <jeffrey.b.shaw at intel.com>
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 <jeffrey.b.shaw at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 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 <jeffrey.b.shaw at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Jeff Shaw <jeffrey.b.shaw at intel.com>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>