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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

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/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/8650a0c17cb7ea1c2349abe04be10c8e76fb297a

Thanks.

Luca Boccassi

---
>From 8650a0c17cb7ea1c2349abe04be10c8e76fb297a 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 a3cf77f0e3..b5408337c8 100644
--- a/drivers/bus/dpaa/include/fsl_fman.h
+++ b/drivers/bus/dpaa/include/fsl_fman.h
@@ -9,10 +9,6 @@
 
 #include <rte_compat.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 48d5cf4625..467baa09b4 100644
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/rte_dpaa_bus.h
@@ -17,6 +17,10 @@
 #include <fsl_bman.h>
 #include <netcfg.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* 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
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-18 12:37:40.922505778 +0000
+++ 0078-bus-dpaa-fix-C-include-guard.patch	2022-02-18 12:37:37.754793350 +0000
@@ -1 +1 @@
-From 1785d9eb62eea2b32c08ea30bfdd318e45b8120c Mon Sep 17 00:00:00 2001
+From 8650a0c17cb7ea1c2349abe04be10c8e76fb297a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1785d9eb62eea2b32c08ea30bfdd318e45b8120c ]
+
@@ -19 +21 @@
-index acb344584f..20690f8329 100644
+index a3cf77f0e3..b5408337c8 100644
@@ -34 +36 @@
-index 31a5ea3fca..54bb1436fd 100644
+index 48d5cf4625..467baa09b4 100644