patch 'bus/dpaa: fix C++ include guard' has been queued to stable release 19.11.12

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.12

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/27/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/f01ea4e120ec3139dd389f4e2896be7914c0d1ae

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From f01ea4e120ec3139dd389f4e2896be7914c0d1ae Mon Sep 17 00:00:00 2001
From: Weiguo Li <liwg06 at foxmail.com>
Date: Mon, 7 Feb 2022 20:36:56 +0800
Subject: [PATCH] bus/dpaa: fix C++ include guard

[ upstream commit 1785d9eb62eea2b32c08ea30bfdd318e45b8120c ]

Supplement the missing half of braces for the extern "C" block,
or remove the incomplete guard in internal header.

Fixes: 6d6b4f49a155 ("bus/dpaa: add FMAN hardware operations")
Fixes: 919eeaccb2ba ("bus/dpaa: introduce NXP DPAA bus driver skeleton")

Signed-off-by: Weiguo Li <liwg06 at foxmail.com>
---
 drivers/bus/dpaa/include/fsl_fman.h | 4 ----
 drivers/bus/dpaa/rte_dpaa_bus.h     | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/bus/dpaa/include/fsl_fman.h b/drivers/bus/dpaa/include/fsl_fman.h
index 1d1ce86719..6b426a7b93 100644
--- a/drivers/bus/dpaa/include/fsl_fman.h
+++ b/drivers/bus/dpaa/include/fsl_fman.h
@@ -7,10 +7,6 @@
 #ifndef __FSL_FMAN_H
 #define __FSL_FMAN_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Status field in FD is updated on Rx side by FMAN with following information.
  * Refer to field description in FM BG.
  */
diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h
index 373aca9785..f85bf86cc3 100644
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/rte_dpaa_bus.h
@@ -16,6 +16,10 @@
 #include <fsl_bman.h>
 #include <netcfg.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DPAA_MEMPOOL_OPS_NAME	"dpaa"
 
 #define DEV_TO_DPAA_DEVICE(ptr)	\
-- 
2.35.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-25 16:58:45.601739873 +0100
+++ 0035-bus-dpaa-fix-C-include-guard.patch	2022-02-25 16:58:44.248990421 +0100
@@ -1 +1 @@
-From 1785d9eb62eea2b32c08ea30bfdd318e45b8120c Mon Sep 17 00:00:00 2001
+From f01ea4e120ec3139dd389f4e2896be7914c0d1ae Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1785d9eb62eea2b32c08ea30bfdd318e45b8120c ]
+
@@ -19 +21 @@
-index acb344584f..20690f8329 100644
+index 1d1ce86719..6b426a7b93 100644
@@ -22,3 +24,3 @@
-@@ -9,10 +9,6 @@
- 
- #include <rte_compat.h>
+@@ -7,10 +7,6 @@
+ #ifndef __FSL_FMAN_H
+ #define __FSL_FMAN_H
@@ -34 +36 @@
-index 31a5ea3fca..54bb1436fd 100644
+index 373aca9785..f85bf86cc3 100644
@@ -37 +39 @@
-@@ -17,6 +17,10 @@
+@@ -16,6 +16,10 @@
@@ -45,3 +47,3 @@
- /* This sequence number field is used to store event entry index for
-  * driver specific usage. For parallel mode queues, invalid
-  * index will be set and for atomic mode queues, valid value
+ #define DPAA_MEMPOOL_OPS_NAME	"dpaa"
+ 
+ #define DEV_TO_DPAA_DEVICE(ptr)	\