[dpdk-stable] patch 'net: move stack variable at top of VLAN strip function' has been queued to LTS release 17.11.5

[Yongseok Koh]

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 e6dbcd545129600cd8ed4cc29dc5a3f5dd96e586 Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Sat, 12 May 2018 10:00:17 +0800
Subject: [PATCH] net: move stack variable at top of VLAN strip function

[ upstream commit 5a7e5accc695e5cf0ed840f59042dba4cbe0aae3 ]

In function 'rte_vlan_strip':
rte_ether.h:357:2:
warning: ISO C90 forbids mixed declarations and code
[-Wdeclaration-after-statement]
  struct vlan_hdr *vh = (struct vlan_hdr *)(eh + 1);

Fixes: c974021a5949 ("ether: add soft vlan encap/decap")

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

diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
index 06d7b486c..10d906e6f 100644
--- a/lib/librte_net/rte_ether.h
+++ b/lib/librte_net/rte_ether.h
@@ -353,11 +353,12 @@ static inline int rte_vlan_strip(struct rte_mbuf *m)
 {
 	struct ether_hdr *eh
 		 = rte_pktmbuf_mtod(m, struct ether_hdr *);
+	struct vlan_hdr *vh;
 
 	if (eh->ether_type != rte_cpu_to_be_16(ETHER_TYPE_VLAN))
 		return -1;
 
-	struct vlan_hdr *vh = (struct vlan_hdr *)(eh + 1);
+	vh = (struct vlan_hdr *)(eh + 1);
 	m->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
 	m->vlan_tci = rte_be_to_cpu_16(vh->vlan_tci);
 
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:12.373693797 -0800
+++ 0005-net-move-stack-variable-at-top-of-VLAN-strip-functio.patch	2019-01-02 23:59:12.008819000 -0800
@@ -1,8 +1,10 @@
-From 5a7e5accc695e5cf0ed840f59042dba4cbe0aae3 Mon Sep 17 00:00:00 2001
+From e6dbcd545129600cd8ed4cc29dc5a3f5dd96e586 Mon Sep 17 00:00:00 2001
 From: Andy Green <andy at warmcat.com>
 Date: Sat, 12 May 2018 10:00:17 +0800
 Subject: [PATCH] net: move stack variable at top of VLAN strip function
 
+[ upstream commit 5a7e5accc695e5cf0ed840f59042dba4cbe0aae3 ]
+
 In function 'rte_vlan_strip':
 rte_ether.h:357:2:
 warning: ISO C90 forbids mixed declarations and code
@@ -10,7 +12,6 @@
   struct vlan_hdr *vh = (struct vlan_hdr *)(eh + 1);
 
 Fixes: c974021a5949 ("ether: add soft vlan encap/decap")
-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, 2 insertions(+), 1 deletion(-)
 
 diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
-index 95d0a533f..27c919594 100644
+index 06d7b486c..10d906e6f 100644
 --- a/lib/librte_net/rte_ether.h
 +++ b/lib/librte_net/rte_ether.h
-@@ -350,11 +350,12 @@ static inline int rte_vlan_strip(struct rte_mbuf *m)
+@@ -353,11 +353,12 @@ static inline int rte_vlan_strip(struct rte_mbuf *m)
  {
  	struct ether_hdr *eh
  		 = rte_pktmbuf_mtod(m, struct ether_hdr *);