[dpdk-stable] patch 'mbuf: fix missing header include' has been queued to stable release 19.11.7

Christian Ehrhardt christian.ehrhardt at canonical.com
Thu Feb 4 12:29:49 CET 2021


Hi,

FYI, your patch has been queued to stable release 19.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/06/21. 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/13315a758590a4b0abcea28405560206094dbdf6

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 13315a758590a4b0abcea28405560206094dbdf6 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 15 Jan 2021 11:10:37 +0000
Subject: [PATCH] mbuf: fix missing header include

[ upstream commit b7c0591fd6117be644b16fc85bfdb2bbb362820f ]

The rte_mbuf_dyn.h header file uses a number of types and macros without
including the required header files to get the definitions of those
macros/types.  Similarly, the rte_mbuf_core.h file was missing an
include for rte_byteorder.h header.

Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags")
Fixes: 3eb860b08eb7 ("mbuf: move definitions into a separate file")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_mbuf/rte_mbuf_core.h | 2 ++
 lib/librte_mbuf/rte_mbuf_dyn.h  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h
index 9a8557d1cc..e7f38422e7 100644
--- a/lib/librte_mbuf/rte_mbuf_core.h
+++ b/lib/librte_mbuf/rte_mbuf_core.h
@@ -15,7 +15,9 @@
  */
 
 #include <stdint.h>
+
 #include <rte_compat.h>
+#include <rte_byteorder.h>
 #include <generic/rte_atomic.h>
 
 #ifdef __cplusplus
diff --git a/lib/librte_mbuf/rte_mbuf_dyn.h b/lib/librte_mbuf/rte_mbuf_dyn.h
index 638444724c..2a87ef9217 100644
--- a/lib/librte_mbuf/rte_mbuf_dyn.h
+++ b/lib/librte_mbuf/rte_mbuf_dyn.h
@@ -66,8 +66,12 @@
  * - any name that does not start with "rte_" in an application
  */
 
+#include <stdio.h>
+#include <stdint.h>
 #include <sys/types.h>
 
+#include <rte_compat.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:33.443315887 +0100
+++ 0134-mbuf-fix-missing-header-include.patch	2021-02-04 12:04:28.202789895 +0100
@@ -1 +1 @@
-From b7c0591fd6117be644b16fc85bfdb2bbb362820f Mon Sep 17 00:00:00 2001
+From 13315a758590a4b0abcea28405560206094dbdf6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b7c0591fd6117be644b16fc85bfdb2bbb362820f ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 567551deab..a85cabdd18 100644
+index 9a8557d1cc..e7f38422e7 100644
@@ -27 +28 @@
-@@ -17,7 +17,9 @@
+@@ -15,7 +15,9 @@
@@ -38 +39 @@
-index fc4eee71d0..13f06d8ed2 100644
+index 638444724c..2a87ef9217 100644


More information about the stable mailing list