intermeidary commit: updating benetel 4g driver to dpdk 20

cmake_targets/CMakeLists.txt

@@ -958,8 +958,6 @@ set_target_properties(tcp_bridge_oai PROPERTIES COMPILE_FLAGS "-fvisibility=hidd
 ######################################################################
 
 
-include_directories ("/usr/include/dpdk")
-
 set(HWLIB_BENETEL_4G_SOURCE
   ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/4g/benetel.c
   ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/4g/shared_buffers.c
@@ -969,9 +967,9 @@ set(HWLIB_BENETEL_4G_SOURCE
   )
 add_library(benetel_4g MODULE ${HWLIB_BENETEL_4G_SOURCE} )
 
-set_target_properties(benetel_4g PROPERTIES COMPILE_FLAGS "-fvisibility=hidden -march=native -I$ENV{RTE_SDK}/$ENV{RTE_TARGET}/include")
+set_target_properties(benetel_4g PROPERTIES COMPILE_FLAGS "-fvisibility=hidden -march=native -I/usr/local/include")
 
-SET(DPDK_LIBS "-Wl,-rpath,$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -Wl,--whole-archive -L$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -ldpdk -Wl,--no-whole-archive")
+SET(DPDK_LIBS "-Wl,-rpath,/usr/local/lib64 -Wl,--whole-archive -L/usr/local/lib64 -ldpdk -Wl,--no-whole-archive")
 TARGET_LINK_LIBRARIES(benetel_4g ${DPDK_LIBS})
 TARGET_LINK_LIBRARIES(benetel_4g pthread dl rt m numa)
 

targets/ARCH/ETHERNET/benetel/4g/benetel.c

@@ -27,6 +27,7 @@
 #include "low.h"
 #include "common/utils/LOG/log.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
+#include "rte_version.h"
 
 typedef struct {
   eth_state_t           e;
@@ -40,6 +41,7 @@ typedef struct {
 int trx_benetel_start(openair0_device *device)
 {
   printf("BENETEL: %s\n", __FUNCTION__);
+  printf("DPDK Version %s\n", rte_version()); 
   return 0;
 }
 

targets/ARCH/ETHERNET/benetel/4g/dpdk_driver.c

@@ -69,7 +69,7 @@ static int mac_updating = 1;
 static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
 static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
 /* ethernet addresses of ports */
-static struct ether_addr l2fwd_ports_eth_addr[RTE_MAX_ETHPORTS];
+static struct rte_ether_addr l2fwd_ports_eth_addr[RTE_MAX_ETHPORTS];
 /* mask of enabled ports */
 static uint32_t l2fwd_enabled_port_mask = 0;
 /* list of enabled ports */
@@ -149,7 +149,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
 {
 	unsigned char *buf, *buf_tx;
 	unsigned int len;
-	struct ether_hdr *eth;
+	struct rte_ether_hdr *eth;
 
 	unsigned dst_port;
 	int sent, prach_ctrl = 0;