From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id E0BEEA051C
for <public@inbox.dpdk.org>; Tue, 11 Feb 2020 12:29:46 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id C58383256;
Tue, 11 Feb 2020 12:29:46 +0100 (CET)
Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com
[209.85.128.68]) by dpdk.org (Postfix) with ESMTP id EC8B81BFAD
for <stable@dpdk.org>; Tue, 11 Feb 2020 12:29:44 +0100 (CET)
Received: by mail-wm1-f68.google.com with SMTP id m10so2053378wmc.0
for <stable@dpdk.org>; Tue, 11 Feb 2020 03:29:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=7iPuLr5eZIs/hJQo0CoT2Z0XQ6RxRco5A1URnS1aWHU=;
b=dqN50otxmoIfhfbKLmE7Ao1w1yoyR1IaKMn0YB2wjAIVZFWsidQyU/rMXAvcD+DjUx
b5VASMkegZCDHM0xoc9KFDF2FkdT8wut6Op+Kp3cPazF9+UeYiKjf9Zrzy72yqhWh5eW
0iyw4jgl8/gr//rfZC1hga8xzk1ktqnPQ4L76IhBYt+0IArjwMv1/Wm2HGOzxQ9Tlmsv
xwafvB6F/iwWbtPCUwk+5cW16x3A15xoBhTXTtJfujIOuAWMq/OIt0ujH2oWDjrqJf+Q
EagqFwRpe7pTbYSDAJxn3EnDnSwbAzdxH8LGHN1avVPqtskg+e9HeshazjdeKOCAAJPr
kJ9g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=7iPuLr5eZIs/hJQo0CoT2Z0XQ6RxRco5A1URnS1aWHU=;
b=shWjzPQyAeOaQuGVzWJXzfiaANc4rbgGTyc+SmhjhHzzcViz0c933qO3xnM5ZsJDj/
e0dqcKMgIMg0a4AZfpl6nGTe8VSeD8bB0cfsy1gKtA1cPG7t6nBukNVEjJ7IWlZtP7Ih
8C4UajWFcXTphltnkQ9rVdyEeIkYc7FKYSTLjeGuhbZooLFPNfNDWJqoytmibVik6JAV
AxxXXKwrnB9PSwa/j3yTloILH6V/1RT0fVtcPvSuCAduVZmteGgqcYbOK7JD7jjfp1B/
Vne0EkwuvBHBo+j+a2nk5mnOxHGURKd44jnv4u8NQRoCXy5W7LltoMB1rDC90YV+eSIY
Zxtw==
X-Gm-Message-State: APjAAAVkkSPhUOlp9kq69kjag9st2nvVIXqi+RaCxPuZOtbDSdDLmoIP
AE5UOSpTzc3lSGJlgKJbnMI=
X-Google-Smtp-Source: APXvYqzsQVdRFT4kr5R12Yk8YCCYXh8U+yDvvbl2Agu/pWN83HyK9vHwF+NRKcacffnqt0yO26SA9Q==
X-Received: by 2002:a7b:cfd1:: with SMTP id f17mr4996732wmm.187.1581420584652;
Tue, 11 Feb 2020 03:29:44 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id z10sm3158914wmk.31.2020.02.11.03.29.43
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 11 Feb 2020 03:29:43 -0800 (PST)
From: luca.boccassi@gmail.com
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: Ferruh Yigit <ferruh.yigit@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Tue, 11 Feb 2020 11:20:52 +0000
Message-Id: <20200211112216.3929-106-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com>
References: <20200211112216.3929-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'kni: rename variable with namespace prefix'
has been queued to stable release 19.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.1
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/13/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.
Thanks.
Luca Boccassi
---
>From 78d9a1a7139a90a23053730d00a5bbafca0a1c21 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@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@networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit@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 5e75c6371f..ca5f92a47b 100644
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -32,7 +32,7 @@
#define MBUF_BURST_SZ 32
/* Default carrier state for created KNI network interfaces */
-extern uint32_t dflt_carrier;
+extern uint32_t kni_dflt_carrier;
/**
* A structure describing the private information for a kni device.
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index cda71bde08..2b464c4381 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -39,7 +39,7 @@ 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 */
@@ -554,14 +554,14 @@ static int __init
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;
@@ -588,7 +588,7 @@ kni_init(void)
return -EINVAL;
}
- if (dflt_carrier == 0)
+ if (kni_dflt_carrier == 0)
pr_debug("Default carrier state set to off.\n");
else
pr_debug("Default carrier state set to on.\n");
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 1ba9b1b99f..97fe85be9a 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -158,7 +158,7 @@ kni_net_open(struct net_device *dev)
struct kni_dev *kni = netdev_priv(dev);
netif_start_queue(dev);
- if (dflt_carrier == 1)
+ if (kni_dflt_carrier == 1)
netif_carrier_on(dev);
else
netif_carrier_off(dev);
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-11 11:17:42.522961215 +0000
+++ 0106-kni-rename-variable-with-namespace-prefix.patch 2020-02-11 11:17:38.572004563 +0000
@@ -1,13 +1,14 @@
-From c793dce9858d9194b999e2af626a2c314ef0cc43 Mon Sep 17 00:00:00 2001
+From 78d9a1a7139a90a23053730d00a5bbafca0a1c21 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@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")
-Cc: stable@dpdk.org
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>