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 <[email protected]> Change-Id: Id6fb6d9adc8b1324ef436aab3897f898a9304e9c
opnfv · Dec 16, 2022 · 52af0b5 · 52af0b5
1 parent 37ac0f7
commit 52af0b5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"