[dpdk-stable] patch 'kni: rename variable with namespace prefix' has been queued to LTS release 18.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/20/20. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4f62f1d84d03b56390ff1a514e21e5f67e06cdcc

Thanks.

Kevin.

---
>From 4f62f1d84d03b56390ff1a514e21e5f67e06cdcc Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Fri, 20 Dec 2019 17:02:14 -0800
Subject: [PATCH] kni: rename variable with namespace prefix

[ upstream commit c793dce9858d9194b999e2af626a2c314ef0cc43 ]

All global variables in kernel should be prefixed by the same
to avoid any symbol conflics. Rename dflt_carrier to kni_default_carrier.

Fixes: 89397a01ce4a ("kni: set default carrier state of interface")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 kernel/linux/kni/kni_dev.h  |  2 +-
 kernel/linux/kni/kni_misc.c | 10 +++++-----
 kernel/linux/kni/kni_net.c  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index 688f574a4a..c425950646 100644
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -31,5 +31,5 @@
 
 /* Default carrier state for created KNI network interfaces */
-extern uint32_t dflt_carrier;
+extern uint32_t kni_dflt_carrier;
 
 /**
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index 8bf0e21038..0f21fd6cbe 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -42,5 +42,5 @@ static uint32_t multiple_kthread_on;
 /* Default carrier state for created KNI network interfaces */
 static char *carrier;
-uint32_t dflt_carrier;
+uint32_t kni_dflt_carrier;
 
 #define KNI_DEV_IN_USE_BIT_NUM 0 /* Bit number for device in use */
@@ -595,12 +595,12 @@ kni_parse_carrier_state(void)
 {
 	if (!carrier) {
-		dflt_carrier = 0;
+		kni_dflt_carrier = 0;
 		return 0;
 	}
 
 	if (strcmp(carrier, "off") == 0)
-		dflt_carrier = 0;
+		kni_dflt_carrier = 0;
 	else if (strcmp(carrier, "on") == 0)
-		dflt_carrier = 1;
+		kni_dflt_carrier = 1;
 	else
 		return -1;
@@ -629,5 +629,5 @@ kni_init(void)
 	}
 
-	if (dflt_carrier == 0)
+	if (kni_dflt_carrier == 0)
 		pr_debug("Default carrier state set to off.\n");
 	else
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 432d56a19b..f3f2f73c7b 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -122,5 +122,5 @@ kni_net_open(struct net_device *dev)
 
 	netif_start_queue(dev);
-	if (dflt_carrier == 1)
+	if (kni_dflt_carrier == 1)
 		netif_carrier_on(dev);
 	else
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-14 17:02:37.553676172 +0000
+++ 0009-kni-rename-variable-with-namespace-prefix.patch	2020-02-14 17:02:36.935408272 +0000
@@ -1 +1 @@
-From c793dce9858d9194b999e2af626a2c314ef0cc43 Mon Sep 17 00:00:00 2001
+From 4f62f1d84d03b56390ff1a514e21e5f67e06cdcc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c793dce9858d9194b999e2af626a2c314ef0cc43 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 5e75c6371f..ca5f92a47b 100644
+index 688f574a4a..c425950646 100644
@@ -24 +25 @@
-@@ -33,5 +33,5 @@
+@@ -31,5 +31,5 @@
@@ -32 +33 @@
-index cda71bde08..2b464c4381 100644
+index 8bf0e21038..0f21fd6cbe 100644
@@ -35 +36 @@
-@@ -40,5 +40,5 @@ static uint32_t multiple_kthread_on;
+@@ -42,5 +42,5 @@ static uint32_t multiple_kthread_on;
@@ -42 +43 @@
-@@ -555,12 +555,12 @@ kni_parse_carrier_state(void)
+@@ -595,12 +595,12 @@ kni_parse_carrier_state(void)
@@ -58 +59 @@
-@@ -589,5 +589,5 @@ kni_init(void)
+@@ -629,5 +629,5 @@ kni_init(void)
@@ -66 +67 @@
-index 1ba9b1b99f..97fe85be9a 100644
+index 432d56a19b..f3f2f73c7b 100644
@@ -69 +70 @@
-@@ -159,5 +159,5 @@ kni_net_open(struct net_device *dev)
+@@ -122,5 +122,5 @@ kni_net_open(struct net_device *dev)