patch 'baseband/acc100: remove RTE prefix for internal macros' has been queued to stable release 20.11.6

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.6

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/0af3e2fef90cc20ea801e27d6755c5772f0151bf

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 0af3e2fef90cc20ea801e27d6755c5772f0151bf Mon Sep 17 00:00:00 2001
From: Nicolas Chautru <nicolas.chautru at intel.com>
Date: Tue, 31 May 2022 15:31:44 -0700
Subject: [PATCH] baseband/acc100: remove RTE prefix for internal macros
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 7936b764ecb91b58dfd7b1d81a053fa085e7eef8 ]

Cosmetic update to remove RTE_ prefix for a define
kept internal.

Signed-off-by: Nicolas Chautru <nicolas.chautru at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/baseband/acc100/rte_acc100_pmd.c | 4 ++--
 drivers/baseband/acc100/rte_acc100_pmd.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c
index cc3f54ef29..9254207969 100644
--- a/drivers/baseband/acc100/rte_acc100_pmd.c
+++ b/drivers/baseband/acc100/rte_acc100_pmd.c
@@ -1131,7 +1131,7 @@ static const struct rte_bbdev_ops acc100_bbdev_ops = {
 /* ACC100 PCI PF address map */
 static struct rte_pci_id pci_id_acc100_pf_map[] = {
 	{
-		RTE_PCI_DEVICE(RTE_ACC100_VENDOR_ID, RTE_ACC100_PF_DEVICE_ID)
+		RTE_PCI_DEVICE(ACC100_VENDOR_ID, ACC100_PF_DEVICE_ID)
 	},
 	{.device_id = 0},
 };
@@ -1139,7 +1139,7 @@ static struct rte_pci_id pci_id_acc100_pf_map[] = {
 /* ACC100 PCI VF address map */
 static struct rte_pci_id pci_id_acc100_vf_map[] = {
 	{
-		RTE_PCI_DEVICE(RTE_ACC100_VENDOR_ID, RTE_ACC100_VF_DEVICE_ID)
+		RTE_PCI_DEVICE(ACC100_VENDOR_ID, ACC100_VF_DEVICE_ID)
 	},
 	{.device_id = 0},
 };
diff --git a/drivers/baseband/acc100/rte_acc100_pmd.h b/drivers/baseband/acc100/rte_acc100_pmd.h
index 071b37cf9d..b3956e9928 100644
--- a/drivers/baseband/acc100/rte_acc100_pmd.h
+++ b/drivers/baseband/acc100/rte_acc100_pmd.h
@@ -27,9 +27,9 @@
 #define ACC100VF_DRIVER_NAME           intel_acc100_vf
 
 /* ACC100 PCI vendor & device IDs */
-#define RTE_ACC100_VENDOR_ID           (0x8086)
-#define RTE_ACC100_PF_DEVICE_ID        (0x0d5c)
-#define RTE_ACC100_VF_DEVICE_ID        (0x0d5d)
+#define ACC100_VENDOR_ID           (0x8086)
+#define ACC100_PF_DEVICE_ID        (0x0d5c)
+#define ACC100_VF_DEVICE_ID        (0x0d5d)
 
 /* Values used in filling in descriptors */
 #define ACC100_DMA_DESC_TYPE           2
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-20 15:00:59.135449358 +0800
+++ 0007-baseband-acc100-remove-RTE-prefix-for-internal-macro.patch	2022-07-20 15:00:58.654333922 +0800
@@ -1 +1 @@
-From 7936b764ecb91b58dfd7b1d81a053fa085e7eef8 Mon Sep 17 00:00:00 2001
+From 0af3e2fef90cc20ea801e27d6755c5772f0151bf Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 7936b764ecb91b58dfd7b1d81a053fa085e7eef8 ]
@@ -17 +20 @@
-index 32c8bc2b34..210028bb15 100644
+index cc3f54ef29..9254207969 100644
@@ -20 +23 @@
-@@ -1133,7 +1133,7 @@ static const struct rte_bbdev_ops acc100_bbdev_ops = {
+@@ -1131,7 +1131,7 @@ static const struct rte_bbdev_ops acc100_bbdev_ops = {
@@ -29 +32 @@
-@@ -1141,7 +1141,7 @@ static struct rte_pci_id pci_id_acc100_pf_map[] = {
+@@ -1139,7 +1139,7 @@ static struct rte_pci_id pci_id_acc100_pf_map[] = {