From: Patrice Buriez <patrice.buriez@chenapan.org>
Date: Fri, 30 Dec 2022 07:16:54 +0000 (+0000)
Subject: Add support for DPDK 22.11
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F73752%2F1;p=samplevnf.git

Add support for DPDK 22.11

Note that DPDK must be built with 'enable_driver_sdk' option enabled,
in order to expose the PCI driver API, now marked as internal. See
http://doc.dpdk.org/guides-22.11/rel_notes/release_22_11.html#api-changes
for details. This is done by supplying the '-Denable_driver_sdk=true'
command line parameter, either to 'meson setup', or later on to 'meson
configure', before running 'ninja' and 'ninja install'.

Signed-off-by: Patrice Buriez <patrice.buriez@chenapan.org>
Change-Id: I5aa57cec851a68fa2a2d2fc63d4e12311e5742f9
---

diff --git a/VNFs/DPPD-PROX/prox_port_cfg.c b/VNFs/DPPD-PROX/prox_port_cfg.c
index 7285a80a..add05a5e 100644
--- a/VNFs/DPPD-PROX/prox_port_cfg.c
+++ b/VNFs/DPPD-PROX/prox_port_cfg.c
@@ -497,8 +497,10 @@ static void print_port_capa(struct prox_port_cfg *port_cfg)
 		plog_info("OUTER_IPV4_CKSUM | ");
 	if (port_cfg->dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_MACSEC_STRIP)
 		plog_info("MACSEC STRIP | ");
+#if defined(RTE_ETH_RX_OFFLOAD_HEADER_SPLIT)
 	if (port_cfg->dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_HEADER_SPLIT)
 		plog_info("HEADER SPLIT | ");
+#endif
 	if (port_cfg->dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_VLAN_FILTER)
 		plog_info("VLAN FILTER | ");
 	if (port_cfg->dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_VLAN_EXTEND)
diff --git a/VNFs/DPPD-PROX/prox_port_cfg.h b/VNFs/DPPD-PROX/prox_port_cfg.h
index 24fd8aac..958597b8 100644
--- a/VNFs/DPPD-PROX/prox_port_cfg.h
+++ b/VNFs/DPPD-PROX/prox_port_cfg.h
@@ -21,9 +21,13 @@
 #include <rte_ether.h>
 #include <rte_ethdev.h>
 #include <rte_version.h>
+#if RTE_VERSION >= RTE_VERSION_NUM(22,11,0,0)
+#include <bus_pci_driver.h>	// Please configure DPDK with meson option -Denable_driver_sdk=true
+#else
 #if RTE_VERSION >= RTE_VERSION_NUM(17,11,0,0)
 #include <rte_bus_pci.h>
 #endif
+#endif
 #include <rte_pci.h>
 
 #include "prox_compat.h"