[dpdk-stable] patch 'examples/ipsec-secgw: make local variables static' has been queued to LTS release 17.11.6

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 03/13/19. So please
shout if anyone has objection.

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 aa933fd9020e3101488ad12b12633535fa467c6d Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev at intel.com>
Date: Thu, 10 Jan 2019 21:09:08 +0000
Subject: [PATCH] examples/ipsec-secgw: make local variables static

[ upstream commit d92fc70e14f43d13be4204c51ed7f3a671c1bcc4 ]

in sp4.c and sp6.c there are few globals that used only locally.
Define them as static ones.

Signed-off-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
Acked-by: Radu Nicolau <radu.nicolau at intel.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 examples/ipsec-secgw/sp4.c | 10 +++++-----
 examples/ipsec-secgw/sp6.c | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/ipsec-secgw/sp4.c b/examples/ipsec-secgw/sp4.c
index 38c72a927..065cc22e0 100644
--- a/examples/ipsec-secgw/sp4.c
+++ b/examples/ipsec-secgw/sp4.c
@@ -73,7 +73,7 @@ enum {
 	RTE_ACL_IPV4_NUM
 };
 
-struct rte_acl_field_def ip4_defs[NUM_FIELDS_IPV4] = {
+static struct rte_acl_field_def ip4_defs[NUM_FIELDS_IPV4] = {
 	{
 	.type = RTE_ACL_FIELD_TYPE_BITMASK,
 	.size = sizeof(uint8_t),
@@ -114,11 +114,11 @@ struct rte_acl_field_def ip4_defs[NUM_FIELDS_IPV4] = {
 
 RTE_ACL_RULE_DEF(acl4_rules, RTE_DIM(ip4_defs));
 
-struct acl4_rules acl4_rules_out[MAX_ACL_RULE_NUM];
-uint32_t nb_acl4_rules_out;
+static struct acl4_rules acl4_rules_out[MAX_ACL_RULE_NUM];
+static uint32_t nb_acl4_rules_out;
 
-struct acl4_rules acl4_rules_in[MAX_ACL_RULE_NUM];
-uint32_t nb_acl4_rules_in;
+static struct acl4_rules acl4_rules_in[MAX_ACL_RULE_NUM];
+static uint32_t nb_acl4_rules_in;
 
 void
 parse_sp4_tokens(char **tokens, uint32_t n_tokens,
diff --git a/examples/ipsec-secgw/sp6.c b/examples/ipsec-secgw/sp6.c
index 62fb492ce..a197942ad 100644
--- a/examples/ipsec-secgw/sp6.c
+++ b/examples/ipsec-secgw/sp6.c
@@ -63,7 +63,7 @@ enum {
 
 #define IP6_ADDR_SIZE 16
 
-struct rte_acl_field_def ip6_defs[IP6_NUM] = {
+static struct rte_acl_field_def ip6_defs[IP6_NUM] = {
 	{
 	.type = RTE_ACL_FIELD_TYPE_BITMASK,
 	.size = sizeof(uint8_t),
@@ -145,11 +145,11 @@ struct rte_acl_field_def ip6_defs[IP6_NUM] = {
 
 RTE_ACL_RULE_DEF(acl6_rules, RTE_DIM(ip6_defs));
 
-struct acl6_rules acl6_rules_out[MAX_ACL_RULE_NUM];
-uint32_t nb_acl6_rules_out;
+static struct acl6_rules acl6_rules_out[MAX_ACL_RULE_NUM];
+static uint32_t nb_acl6_rules_out;
 
-struct acl6_rules acl6_rules_in[MAX_ACL_RULE_NUM];
-uint32_t nb_acl6_rules_in;
+static struct acl6_rules acl6_rules_in[MAX_ACL_RULE_NUM];
+static uint32_t nb_acl6_rules_in;
 
 void
 parse_sp6_tokens(char **tokens, uint32_t n_tokens,
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-03-08 09:46:41.755733207 -0800
+++ 0029-examples-ipsec-secgw-make-local-variables-static.patch	2019-03-08 09:46:40.115401000 -0800
@@ -1,13 +1,13 @@
-From d92fc70e14f43d13be4204c51ed7f3a671c1bcc4 Mon Sep 17 00:00:00 2001
+From aa933fd9020e3101488ad12b12633535fa467c6d Mon Sep 17 00:00:00 2001
 From: Konstantin Ananyev <konstantin.ananyev at intel.com>
 Date: Thu, 10 Jan 2019 21:09:08 +0000
 Subject: [PATCH] examples/ipsec-secgw: make local variables static
 
+[ upstream commit d92fc70e14f43d13be4204c51ed7f3a671c1bcc4 ]
+
 in sp4.c and sp6.c there are few globals that used only locally.
 Define them as static ones.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
 Acked-by: Radu Nicolau <radu.nicolau at intel.com>
 Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
@@ -17,10 +17,10 @@
  2 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/examples/ipsec-secgw/sp4.c b/examples/ipsec-secgw/sp4.c
-index 8d3d3d8e0..6b05daaa9 100644
+index 38c72a927..065cc22e0 100644
 --- a/examples/ipsec-secgw/sp4.c
 +++ b/examples/ipsec-secgw/sp4.c
-@@ -44,7 +44,7 @@ enum {
+@@ -73,7 +73,7 @@ enum {
  	RTE_ACL_IPV4_NUM
  };
  
@@ -29,7 +29,7 @@
  	{
  	.type = RTE_ACL_FIELD_TYPE_BITMASK,
  	.size = sizeof(uint8_t),
-@@ -85,11 +85,11 @@ struct rte_acl_field_def ip4_defs[NUM_FIELDS_IPV4] = {
+@@ -114,11 +114,11 @@ struct rte_acl_field_def ip4_defs[NUM_FIELDS_IPV4] = {
  
  RTE_ACL_RULE_DEF(acl4_rules, RTE_DIM(ip4_defs));
  
@@ -46,10 +46,10 @@
  void
  parse_sp4_tokens(char **tokens, uint32_t n_tokens,
 diff --git a/examples/ipsec-secgw/sp6.c b/examples/ipsec-secgw/sp6.c
-index 6002afef3..dc5b94c6a 100644
+index 62fb492ce..a197942ad 100644
 --- a/examples/ipsec-secgw/sp6.c
 +++ b/examples/ipsec-secgw/sp6.c
-@@ -34,7 +34,7 @@ enum {
+@@ -63,7 +63,7 @@ enum {
  
  #define IP6_ADDR_SIZE 16
  
@@ -58,7 +58,7 @@
  	{
  	.type = RTE_ACL_FIELD_TYPE_BITMASK,
  	.size = sizeof(uint8_t),
-@@ -116,11 +116,11 @@ struct rte_acl_field_def ip6_defs[IP6_NUM] = {
+@@ -145,11 +145,11 @@ struct rte_acl_field_def ip6_defs[IP6_NUM] = {
  
  RTE_ACL_RULE_DEF(acl6_rules, RTE_DIM(ip6_defs));