From ed61afec61aa9799154056792d730fef06d15a47 Mon Sep 17 00:00:00 2001
From: catherinemeadows <meadowsc@gwu.edu>
Date: Mon, 17 Jan 2022 16:11:57 -0600
Subject: [PATCH] update dpdk funcs and struct for newer version

---
 dpdk-iface-kmod/dpdk_iface_main.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dpdk-iface-kmod/dpdk_iface_main.c b/dpdk-iface-kmod/dpdk_iface_main.c
index 143cea4d1..74a66ea11 100644
--- a/dpdk-iface-kmod/dpdk_iface_main.c
+++ b/dpdk-iface-kmod/dpdk_iface_main.c
@@ -22,7 +22,11 @@
 typedef struct {
 	PciDevice pd;
 	struct rte_eth_dev_info dev_details;
-	struct ether_addr ports_eth_addr;
+#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
+	struct ether_addr port_eth_addr;
+#else
+	struct rte_ether_addr ports_eth_addr;
+#endif
 } DevInfo;
 
 static DevInfo di[RTE_MAX_ETHPORTS];	
@@ -260,7 +264,12 @@ main(int argc, char **argv)
 	ret = rte_eal_init(rte_argc, rte_argv);
 
 	/* get total count of detected ethernet ports */
+#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
 	num_devices = rte_eth_dev_count();
+#else
+	num_devices = rte_eth_dev_count_avail();
+#endif
+
 	if (num_devices == 0) {
 		fprintf(stderr, "No Ethernet port detected!\n");
 		exit(EXIT_FAILURE);