[dpdk-stable] patch 'hash: move stack declaration at top of CRC32c function' has been queued to LTS release 17.11.5

Yongseok Koh yskoh at mellanox.com
Thu Jan 3 09:13:30 CET 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.5

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/04/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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From a68d3fb40aa6df5a3c902b56b85564e558a1f861 Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Sat, 12 May 2018 10:00:32 +0800
Subject: [PATCH] hash: move stack declaration at top of CRC32c function

[ upstream commit f1eb05a1dc64e17bb9d9b6ad29b78f181aae36b8 ]

In function 'crc32c_2words':
rte_hash_crc.h:347:2:
warning: ISO C90 forbids mixed declarations and code
[-Wdeclaration-after-statement]
  uint32_t crc, term1, term2;

Fixes: d983cf41698f ("hash: add software CRC32 implementation")

Signed-off-by: Andy Green <andy at warmcat.com>
Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
---
 lib/librte_hash/rte_hash_crc.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/librte_hash/rte_hash_crc.h
index 93188c290..0d829175d 100644
--- a/lib/librte_hash/rte_hash_crc.h
+++ b/lib/librte_hash/rte_hash_crc.h
@@ -367,14 +367,13 @@ crc32c_1word(uint32_t data, uint32_t init_val)
 static inline uint32_t
 crc32c_2words(uint64_t data, uint32_t init_val)
 {
+	uint32_t crc, term1, term2;
 	union {
 		uint64_t u64;
 		uint32_t u32[2];
 	} d;
 	d.u64 = data;
 
-	uint32_t crc, term1, term2;
-
 	crc = init_val;
 	crc ^= d.u32[0];
 
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:12.485941930 -0800
+++ 0007-hash-move-stack-declaration-at-top-of-CRC32c-functio.patch	2019-01-02 23:59:12.020819000 -0800
@@ -1,8 +1,10 @@
-From f1eb05a1dc64e17bb9d9b6ad29b78f181aae36b8 Mon Sep 17 00:00:00 2001
+From a68d3fb40aa6df5a3c902b56b85564e558a1f861 Mon Sep 17 00:00:00 2001
 From: Andy Green <andy at warmcat.com>
 Date: Sat, 12 May 2018 10:00:32 +0800
 Subject: [PATCH] hash: move stack declaration at top of CRC32c function
 
+[ upstream commit f1eb05a1dc64e17bb9d9b6ad29b78f181aae36b8 ]
+
 In function 'crc32c_2words':
 rte_hash_crc.h:347:2:
 warning: ISO C90 forbids mixed declarations and code
@@ -10,7 +12,6 @@
   uint32_t crc, term1, term2;
 
 Fixes: d983cf41698f ("hash: add software CRC32 implementation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Green <andy at warmcat.com>
 Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
@@ -19,10 +20,10 @@
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/librte_hash/rte_hash_crc.h
-index 479f84b14..5f5fb3db1 100644
+index 93188c290..0d829175d 100644
 --- a/lib/librte_hash/rte_hash_crc.h
 +++ b/lib/librte_hash/rte_hash_crc.h
-@@ -338,14 +338,13 @@ crc32c_1word(uint32_t data, uint32_t init_val)
+@@ -367,14 +367,13 @@ crc32c_1word(uint32_t data, uint32_t init_val)
  static inline uint32_t
  crc32c_2words(uint64_t data, uint32_t init_val)
  {


More information about the stable mailing list