[dpdk-stable] patch 'ring: remove useless variables' has been queued to LTS release 17.11.5

[Yongseok Koh <yskoh@mellanox.com>]

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 cceaf4ae447b26bca6774dc1d3042c78011da798 Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Thu, 17 May 2018 21:49:17 +0800
Subject: [PATCH] ring: remove useless variables

[ backported from upstream commit 712a3db0b5b2c7e6380bdeb84b803bb0e0f97c15 ]

There were warnings with GCC 8.1:

In function '__rte_ring_move_prod_head':
rte_ring_generic.h:76:3:
warning: ISO C90 forbids mixed declarations and code
[-Wdeclaration-after-statement]
   const uint32_t cons_tail = r->cons.tail;
   ^~~~~

In function '__rte_ring_move_cons_head':
rte_ring_generic.h:147:3:
warning: ISO C90 forbids mixed declarations and code
[-Wdeclaration-after-statement]
   const uint32_t prod_tail = r->prod.tail;

Fixes: 0dfc98c507b1 ("ring: separate out head index manipulation")

Signed-off-by: Andy Green <andy@warmcat.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
---
 lib/librte_ring/rte_ring.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
index fc433b050..5b1cb2bfe 100644
--- a/lib/librte_ring/rte_ring.h
+++ b/lib/librte_ring/rte_ring.h
@@ -416,14 +416,13 @@ __rte_ring_move_prod_head(struct rte_ring *r, int is_sp,
 		 */
 		rte_smp_rmb();
 
-		const uint32_t cons_tail = r->cons.tail;
 		/*
 		 *  The subtraction is done between two unsigned 32bits value
 		 * (the result is always modulo 32 bits even if we have
 		 * *old_head > cons_tail). So 'free_entries' is always between 0
 		 * and capacity (which is < size).
 		 */
-		*free_entries = (capacity + cons_tail - *old_head);
+		*free_entries = (capacity + r->cons.tail - *old_head);
 
 		/* check that we have enough room in ring */
 		if (unlikely(n > *free_entries))
@@ -530,12 +529,11 @@ __rte_ring_move_cons_head(struct rte_ring *r, int is_sc,
 		 */
 		rte_smp_rmb();
 
-		const uint32_t prod_tail = r->prod.tail;
 		/* The subtraction is done between two unsigned 32bits value
 		 * (the result is always modulo 32 bits even if we have
 		 * cons_head > prod_tail). So 'entries' is always between 0
 		 * and size(ring)-1. */
-		*entries = (prod_tail - *old_head);
+		*entries = (r->prod.tail - *old_head);
 
 		/* Set the actual entries for dequeue */
 		if (n > *entries)
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:13.159530981 -0800
+++ 0020-ring-remove-useless-variables.patch	2019-01-02 23:59:12.070818000 -0800
@@ -1,8 +1,10 @@
-From 712a3db0b5b2c7e6380bdeb84b803bb0e0f97c15 Mon Sep 17 00:00:00 2001
+From cceaf4ae447b26bca6774dc1d3042c78011da798 Mon Sep 17 00:00:00 2001
 From: Andy Green <andy@warmcat.com>
 Date: Thu, 17 May 2018 21:49:17 +0800
 Subject: [PATCH] ring: remove useless variables
 
+[ backported from upstream commit 712a3db0b5b2c7e6380bdeb84b803bb0e0f97c15 ]
+
 There were warnings with GCC 8.1:
 
 In function '__rte_ring_move_prod_head':
@@ -19,19 +21,18 @@
    const uint32_t prod_tail = r->prod.tail;
 
 Fixes: 0dfc98c507b1 ("ring: separate out head index manipulation")
-Cc: stable@dpdk.org
 
 Signed-off-by: Andy Green <andy@warmcat.com>
 Acked-by: Olivier Matz <olivier.matz@6wind.com>
 ---
- lib/librte_ring/rte_ring_generic.h | 6 ++----
+ lib/librte_ring/rte_ring.h | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/lib/librte_ring/rte_ring_generic.h b/lib/librte_ring/rte_ring_generic.h
-index 5b110425f..c2d482bc9 100644
---- a/lib/librte_ring/rte_ring_generic.h
-+++ b/lib/librte_ring/rte_ring_generic.h
-@@ -73,14 +73,13 @@ __rte_ring_move_prod_head(struct rte_ring *r, int is_sp,
+diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
+index fc433b050..5b1cb2bfe 100644
+--- a/lib/librte_ring/rte_ring.h
++++ b/lib/librte_ring/rte_ring.h
+@@ -416,14 +416,13 @@ __rte_ring_move_prod_head(struct rte_ring *r, int is_sp,
  		 */
  		rte_smp_rmb();
  
@@ -47,7 +48,7 @@
  
  		/* check that we have enough room in ring */
  		if (unlikely(n > *free_entries))
-@@ -144,13 +143,12 @@ __rte_ring_move_cons_head(struct rte_ring *r, int is_sc,
+@@ -530,12 +529,11 @@ __rte_ring_move_cons_head(struct rte_ring *r, int is_sc,
  		 */
  		rte_smp_rmb();
  
@@ -55,8 +56,7 @@
  		/* The subtraction is done between two unsigned 32bits value
  		 * (the result is always modulo 32 bits even if we have
  		 * cons_head > prod_tail). So 'entries' is always between 0
- 		 * and size(ring)-1.
- 		 */
+ 		 * and size(ring)-1. */
 -		*entries = (prod_tail - *old_head);
 +		*entries = (r->prod.tail - *old_head);