From 52af0b5b6f713815e935c8b19076d6ef25a33773 Mon Sep 17 00:00:00 2001
From: Patrice Buriez <patrice.buriez@chenapan.org>
Date: Fri, 16 Dec 2022 13:46:59 +0000
Subject: Fix linker errors with older DPDK versions

when __rte_cache_aligned was defined in rte_memory.h,
rather than in rte_common.h now.

Signed-off-by: Patrice Buriez <patrice.buriez@chenapan.org>
Change-Id: Id6fb6d9adc8b1324ef436aab3897f898a9304e9c
---
 VNFs/DPPD-PROX/handle_gen.c       | 6 ++++++
 VNFs/DPPD-PROX/handle_lb_5tuple.c | 5 +++++
 VNFs/DPPD-PROX/hash_utils.c       | 5 +++++
 VNFs/DPPD-PROX/lconf.h            | 5 +++++
 VNFs/DPPD-PROX/stats_task.h       | 6 +++++-
 5 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'VNFs')

diff --git a/VNFs/DPPD-PROX/handle_gen.c b/VNFs/DPPD-PROX/handle_gen.c
index f625e01c..a67b6596 100644
--- a/VNFs/DPPD-PROX/handle_gen.c
+++ b/VNFs/DPPD-PROX/handle_gen.c
@@ -13,6 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
+
+#include <rte_common.h>
+#ifndef __rte_cache_aligned
+#include <rte_memory.h>
+#endif
+
 #include <rte_mbuf.h>
 #include <pcap.h>
 #include <string.h>
diff --git a/VNFs/DPPD-PROX/handle_lb_5tuple.c b/VNFs/DPPD-PROX/handle_lb_5tuple.c
index d320ca9d..ec229386 100644
--- a/VNFs/DPPD-PROX/handle_lb_5tuple.c
+++ b/VNFs/DPPD-PROX/handle_lb_5tuple.c
@@ -14,6 +14,11 @@
 // limitations under the License.
 */
 
+#include <rte_common.h>
+#ifndef __rte_cache_aligned
+#include <rte_memory.h>
+#endif
+
 #include <rte_hash.h>
 #include <rte_ether.h>
 #include <rte_memcpy.h>
diff --git a/VNFs/DPPD-PROX/hash_utils.c b/VNFs/DPPD-PROX/hash_utils.c
index ad746d5c..3922ef0f 100644
--- a/VNFs/DPPD-PROX/hash_utils.c
+++ b/VNFs/DPPD-PROX/hash_utils.c
@@ -14,6 +14,11 @@
 // limitations under the License.
 */
 
+#include <rte_common.h>
+#ifndef __rte_cache_aligned
+#include <rte_memory.h>
+#endif
+
 #include <string.h>
 #include <rte_hash_crc.h>
 #include <rte_table_hash.h>
diff --git a/VNFs/DPPD-PROX/lconf.h b/VNFs/DPPD-PROX/lconf.h
index 8ac1112e..09f59cd5 100644
--- a/VNFs/DPPD-PROX/lconf.h
+++ b/VNFs/DPPD-PROX/lconf.h
@@ -17,6 +17,11 @@
 #ifndef _LCONF_H_
 #define _LCONF_H_
 
+#include <rte_common.h>
+#ifndef __rte_cache_aligned
+#include <rte_memory.h>
+#endif
+
 #include "task_init.h"
 #include "stats.h"
 
diff --git a/VNFs/DPPD-PROX/stats_task.h b/VNFs/DPPD-PROX/stats_task.h
index 9043fd6a..001ebbc7 100644
--- a/VNFs/DPPD-PROX/stats_task.h
+++ b/VNFs/DPPD-PROX/stats_task.h
@@ -17,8 +17,12 @@
 #ifndef _STATS_TASK_H_
 #define _STATS_TASK_H_
 
-#include <inttypes.h>
 #include <rte_common.h>
+#ifndef __rte_cache_aligned
+#include <rte_memory.h>
+#endif
+
+#include <inttypes.h>
 
 #include "clock.h"
 
-- 
cgit 1.2.3-korg