From 8b25d1ad5d2264bdfc2818c7bda74ee2697df6db Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Wed, 6 Jul 2016 09:22:35 +0200
Subject: Imported Upstream version 16.07-rc1

Change-Id: I40a523e52f12e8496fdd69e902824b0226c303de
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
 lib/librte_port/rte_port_source_sink.c | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'lib/librte_port/rte_port_source_sink.c')

diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/librte_port/rte_port_source_sink.c
index 056c9756..4cad7109 100644
--- a/lib/librte_port/rte_port_source_sink.c
+++ b/lib/librte_port/rte_port_source_sink.c
@@ -38,17 +38,11 @@
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 
-#ifdef RTE_NEXT_ABI
-
 #ifdef RTE_PORT_PCAP
 #include <rte_ether.h>
 #include <pcap.h>
 #endif
 
-#else
-#undef RTE_PORT_PCAP
-#endif
-
 #include "rte_port_source_sink.h"
 
 /*
@@ -81,8 +75,6 @@ struct rte_port_source {
 	uint32_t pkt_index;
 };
 
-#ifdef RTE_NEXT_ABI
-
 #ifdef RTE_PORT_PCAP
 
 static int
@@ -232,8 +224,6 @@ error_exit:
 
 #endif /* RTE_PORT_PCAP */
 
-#endif /* RTE_NEXT_ABI */
-
 static void *
 rte_port_source_create(void *params, int socket_id)
 {
@@ -258,8 +248,6 @@ rte_port_source_create(void *params, int socket_id)
 	/* Initialization */
 	port->mempool = (struct rte_mempool *) p->mempool;
 
-#ifdef RTE_NEXT_ABI
-
 	if (p->file_name) {
 		int status = PCAP_SOURCE_LOAD(port, p->file_name,
 			p->n_bytes_per_pkt, socket_id);
@@ -270,8 +258,6 @@ rte_port_source_create(void *params, int socket_id)
 		}
 	}
 
-#endif
-
 	return port;
 }
 
-- 
cgit 1.2.3-korg