git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/sfc/base: import event prefetch
[dpdk.git]
/
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
056c975
..
4cad710
100644
(file)
--- 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>
#include <rte_malloc.h>
#include <rte_memcpy.h>
-#ifdef RTE_NEXT_ABI
-
#ifdef RTE_PORT_PCAP
#include <rte_ether.h>
#include <pcap.h>
#endif
#ifdef RTE_PORT_PCAP
#include <rte_ether.h>
#include <pcap.h>
#endif
-#else
-#undef RTE_PORT_PCAP
-#endif
-
#include "rte_port_source_sink.h"
/*
#include "rte_port_source_sink.h"
/*
@@
-81,8
+75,6
@@
struct rte_port_source {
uint32_t pkt_index;
};
uint32_t pkt_index;
};
-#ifdef RTE_NEXT_ABI
-
#ifdef RTE_PORT_PCAP
static int
#ifdef RTE_PORT_PCAP
static int
@@
-232,8
+224,6
@@
error_exit:
#endif /* RTE_PORT_PCAP */
#endif /* RTE_PORT_PCAP */
-#endif /* RTE_NEXT_ABI */
-
static void *
rte_port_source_create(void *params, int socket_id)
{
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;
/* 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);
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;
}
return port;
}