diff options
| author | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-10-26 16:48:07 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-10-26 17:29:47 +0300 |
| commit | 05e6b05273ba07ee3ab8e48f55a2cc972287cb2c (patch) | |
| tree | 666ab0d0b1c850b525806ecec3a35b9292f22455 /platform/linux-generic/pktio/io_ops.c | |
| parent | 00af9c28e62d8eeea4f769c9e4b4a74184616086 (diff) | |
| parent | 78872639460a3f454fa69a72f7ea5ab4c547a2b8 (diff) | |
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Conflicts:
example/classifier/odp_classifier.c
include/odp/api/config.h
include/odp/api/cpu.h
include/odp/api/cpumask.h
include/odp/api/packet_io.h
platform/linux-generic/Makefile.am
platform/linux-generic/arch/linux/odp_cpu_cycles.c
test/performance/odp_scheduling.c
test/validation/classification/odp_classification_testsuites.h
test/validation/system/system.c
Diffstat (limited to 'platform/linux-generic/pktio/io_ops.c')
| -rw-r--r-- | platform/linux-generic/pktio/io_ops.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index bd4cc4839..3b344e6ad 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -15,6 +15,9 @@ const pktio_if_ops_t * const pktio_if_ops[] = { #ifdef ODP_NETMAP &netmap_pktio_ops, #endif +#ifdef HAVE_PCAP + &pcap_pktio_ops, +#endif &sock_mmap_pktio_ops, &sock_mmsg_pktio_ops, NULL |