aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Kiss <zoltan.kiss@linaro.org>2015-10-20 18:41:17 +0100
committerZoltan Kiss <zoltan.kiss@linaro.org>2015-10-20 18:41:17 +0100
commitd2a49c73b8765a6afb86058f25c5ad829d1c49ef (patch)
tree3a4ed4a269ac23912a7fba17d559ee36c656ca87
parent54def4432829350e863e647c74162e50431c4f20 (diff)
parentf855321e3f7c242cb017bdcdd2d38e58aedc82a5 (diff)
downloadodp-dpdk-api-next.tar.gz
Merge branch 'master' into api-nextapi-next
Conflicts: platform/linux-dpdk/Makefile.am platform/linux-dpdk/include/odp/packet_flags.h
-rw-r--r--platform/linux-dpdk/Makefile.am104
l---------platform/linux-dpdk/include/odp/align.h1
l---------platform/linux-dpdk/include/odp/atomic.h1
l---------platform/linux-dpdk/include/odp/barrier.h1
l---------platform/linux-dpdk/include/odp/buffer.h1
l---------platform/linux-dpdk/include/odp/byteorder.h1
l---------platform/linux-dpdk/include/odp/classification.h1
l---------platform/linux-dpdk/include/odp/compiler.h1
l---------platform/linux-dpdk/include/odp/config.h1
l---------platform/linux-dpdk/include/odp/cpu.h1
l---------platform/linux-dpdk/include/odp/cpumask.h1
l---------platform/linux-dpdk/include/odp/crypto.h1
l---------platform/linux-dpdk/include/odp/debug.h1
l---------platform/linux-dpdk/include/odp/errno.h1
l---------platform/linux-dpdk/include/odp/event.h1
l---------platform/linux-dpdk/include/odp/hints.h1
l---------platform/linux-dpdk/include/odp/init.h1
l---------platform/linux-dpdk/include/odp/packet_io.h1
l---------platform/linux-dpdk/include/odp/plat/atomic_types.h1
l---------platform/linux-dpdk/include/odp/plat/barrier_types.h1
l---------platform/linux-dpdk/include/odp/plat/byteorder_types.h1
l---------platform/linux-dpdk/include/odp/plat/classification_types.h1
l---------platform/linux-dpdk/include/odp/plat/cpumask_types.h1
l---------platform/linux-dpdk/include/odp/plat/crypto_types.h1
l---------platform/linux-dpdk/include/odp/plat/packet_io_types.h1
l---------platform/linux-dpdk/include/odp/plat/pool_types.h1
l---------platform/linux-dpdk/include/odp/plat/queue_types.h1
l---------platform/linux-dpdk/include/odp/plat/rwlock_types.h1
l---------platform/linux-dpdk/include/odp/plat/schedule_types.h1
l---------platform/linux-dpdk/include/odp/plat/shared_memory_types.h1
l---------platform/linux-dpdk/include/odp/plat/spinlock_types.h1
l---------platform/linux-dpdk/include/odp/plat/strong_types.h1
l---------platform/linux-dpdk/include/odp/plat/thrmask_types.h1
l---------platform/linux-dpdk/include/odp/plat/ticketlock_types.h1
l---------platform/linux-dpdk/include/odp/plat/timer_types.h1
l---------platform/linux-dpdk/include/odp/plat/version_types.h1
l---------platform/linux-dpdk/include/odp/pool.h1
l---------platform/linux-dpdk/include/odp/queue.h1
l---------platform/linux-dpdk/include/odp/random.h1
l---------platform/linux-dpdk/include/odp/rwlock.h1
l---------platform/linux-dpdk/include/odp/schedule.h1
l---------platform/linux-dpdk/include/odp/schedule_types.h1
l---------platform/linux-dpdk/include/odp/shared_memory.h1
l---------platform/linux-dpdk/include/odp/spinlock.h1
l---------platform/linux-dpdk/include/odp/std_types.h1
l---------platform/linux-dpdk/include/odp/sync.h1
l---------platform/linux-dpdk/include/odp/system_info.h1
l---------platform/linux-dpdk/include/odp/thread.h1
l---------platform/linux-dpdk/include/odp/thrmask.h1
l---------platform/linux-dpdk/include/odp/ticketlock.h1
l---------platform/linux-dpdk/include/odp/time.h1
l---------platform/linux-dpdk/include/odp/timer.h1
l---------platform/linux-dpdk/include/odp/version.h1
-rw-r--r--platform/linux-dpdk/include/odp_packet_internal.h3
-rw-r--r--platform/linux-dpdk/m4/configure.m44
l---------platform/linux-dpdk/m4/odp_openssl.m41
l---------platform/linux-dpdk/m4/odp_pthread.m41
-rw-r--r--platform/linux-dpdk/odp_packet_dpdk.c2
-rw-r--r--platform/linux-dpdk/odp_packet_io.c7
59 files changed, 114 insertions, 60 deletions
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index 4b428eb..f713b0d 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -24,66 +24,66 @@ include_HEADERS = \
odpincludedir= $(includedir)/odp
odpinclude_HEADERS = \
- $(top_srcdir)/platform/linux-generic/include/odp/align.h \
- $(top_srcdir)/platform/linux-generic/include/odp/atomic.h \
- $(top_srcdir)/platform/linux-generic/include/odp/barrier.h \
- $(top_srcdir)/platform/linux-generic/include/odp/buffer.h \
- $(top_srcdir)/platform/linux-generic/include/odp/byteorder.h \
- $(top_srcdir)/platform/linux-generic/include/odp/classification.h \
- $(top_srcdir)/platform/linux-generic/include/odp/compiler.h \
- $(top_srcdir)/platform/linux-generic/include/odp/config.h \
- $(top_srcdir)/platform/linux-generic/include/odp/cpu.h \
- $(top_srcdir)/platform/linux-generic/include/odp/cpumask.h \
- $(top_srcdir)/platform/linux-generic/include/odp/crypto.h \
- $(top_srcdir)/platform/linux-generic/include/odp/debug.h \
- $(top_srcdir)/platform/linux-generic/include/odp/errno.h \
- $(top_srcdir)/platform/linux-generic/include/odp/event.h \
- $(top_srcdir)/platform/linux-generic/include/odp/hints.h \
- $(top_srcdir)/platform/linux-generic/include/odp/init.h \
+ $(srcdir)/include/odp/align.h \
+ $(srcdir)/include/odp/atomic.h \
+ $(srcdir)/include/odp/barrier.h \
+ $(srcdir)/include/odp/buffer.h \
+ $(srcdir)/include/odp/byteorder.h \
+ $(srcdir)/include/odp/classification.h \
+ $(srcdir)/include/odp/compiler.h \
+ $(srcdir)/include/odp/config.h \
+ $(srcdir)/include/odp/cpu.h \
+ $(srcdir)/include/odp/cpumask.h \
+ $(srcdir)/include/odp/crypto.h \
+ $(srcdir)/include/odp/debug.h \
+ $(srcdir)/include/odp/errno.h \
+ $(srcdir)/include/odp/event.h \
+ $(srcdir)/include/odp/hints.h \
+ $(srcdir)/include/odp/init.h \
$(srcdir)/include/odp/packet_flags.h \
$(srcdir)/include/odp/packet.h \
- $(top_srcdir)/platform/linux-generic/include/odp/packet_io.h \
- $(top_srcdir)/platform/linux-generic/include/odp/pool.h \
- $(top_srcdir)/platform/linux-generic/include/odp/queue.h \
- $(top_srcdir)/platform/linux-generic/include/odp/random.h \
- $(top_srcdir)/platform/linux-generic/include/odp/rwlock.h \
- $(top_srcdir)/platform/linux-generic/include/odp/schedule.h \
- $(top_srcdir)/platform/linux-generic/include/odp/schedule_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/shared_memory.h \
- $(top_srcdir)/platform/linux-generic/include/odp/spinlock.h \
- $(top_srcdir)/platform/linux-generic/include/odp/std_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/sync.h \
- $(top_srcdir)/platform/linux-generic/include/odp/system_info.h \
- $(top_srcdir)/platform/linux-generic/include/odp/thread.h \
- $(top_srcdir)/platform/linux-generic/include/odp/thrmask.h \
- $(top_srcdir)/platform/linux-generic/include/odp/ticketlock.h \
- $(top_srcdir)/platform/linux-generic/include/odp/time.h \
- $(top_srcdir)/platform/linux-generic/include/odp/timer.h \
- $(top_srcdir)/platform/linux-generic/include/odp/version.h
+ $(srcdir)/include/odp/packet_io.h \
+ $(srcdir)/include/odp/pool.h \
+ $(srcdir)/include/odp/queue.h \
+ $(srcdir)/include/odp/random.h \
+ $(srcdir)/include/odp/rwlock.h \
+ $(srcdir)/include/odp/schedule.h \
+ $(srcdir)/include/odp/schedule_types.h \
+ $(srcdir)/include/odp/shared_memory.h \
+ $(srcdir)/include/odp/spinlock.h \
+ $(srcdir)/include/odp/std_types.h \
+ $(srcdir)/include/odp/sync.h \
+ $(srcdir)/include/odp/system_info.h \
+ $(srcdir)/include/odp/thread.h \
+ $(srcdir)/include/odp/thrmask.h \
+ $(srcdir)/include/odp/ticketlock.h \
+ $(srcdir)/include/odp/time.h \
+ $(srcdir)/include/odp/timer.h \
+ $(srcdir)/include/odp/version.h
odpplatincludedir= $(includedir)/odp/plat
odpplatinclude_HEADERS = \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/atomic_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/barrier_types.h \
+ $(srcdir)/include/odp/plat/atomic_types.h \
+ $(srcdir)/include/odp/plat/barrier_types.h \
$(srcdir)/include/odp/plat/buffer_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/byteorder_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/classification_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/cpumask_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/crypto_types.h \
+ $(srcdir)/include/odp/plat/byteorder_types.h \
+ $(srcdir)/include/odp/plat/classification_types.h \
+ $(srcdir)/include/odp/plat/cpumask_types.h \
+ $(srcdir)/include/odp/plat/crypto_types.h \
$(srcdir)/include/odp/plat/event_types.h \
$(srcdir)/include/odp/plat/packet_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/packet_io_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/pool_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/queue_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/rwlock_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/schedule_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/shared_memory_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/spinlock_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/strong_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/thrmask_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/ticketlock_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/timer_types.h \
- $(top_srcdir)/platform/linux-generic/include/odp/plat/version_types.h
+ $(srcdir)/include/odp/plat/packet_io_types.h \
+ $(srcdir)/include/odp/plat/pool_types.h \
+ $(srcdir)/include/odp/plat/queue_types.h \
+ $(srcdir)/include/odp/plat/rwlock_types.h \
+ $(srcdir)/include/odp/plat/schedule_types.h \
+ $(srcdir)/include/odp/plat/shared_memory_types.h \
+ $(srcdir)/include/odp/plat/spinlock_types.h \
+ $(srcdir)/include/odp/plat/strong_types.h \
+ $(srcdir)/include/odp/plat/thrmask_types.h \
+ $(srcdir)/include/odp/plat/ticketlock_types.h \
+ $(srcdir)/include/odp/plat/timer_types.h \
+ $(srcdir)/include/odp/plat/version_types.h
odpapiincludedir= $(includedir)/odp/api
odpapiinclude_HEADERS = \
diff --git a/platform/linux-dpdk/include/odp/align.h b/platform/linux-dpdk/include/odp/align.h
new file mode 120000
index 0000000..35165bc
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/align.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/align.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/atomic.h b/platform/linux-dpdk/include/odp/atomic.h
new file mode 120000
index 0000000..ff474ba
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/atomic.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/atomic.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/barrier.h b/platform/linux-dpdk/include/odp/barrier.h
new file mode 120000
index 0000000..cfad38d
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/barrier.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/barrier.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/buffer.h b/platform/linux-dpdk/include/odp/buffer.h
new file mode 120000
index 0000000..95c4d7d
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/buffer.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/buffer.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/byteorder.h b/platform/linux-dpdk/include/odp/byteorder.h
new file mode 120000
index 0000000..799b6f9
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/byteorder.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/byteorder.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/classification.h b/platform/linux-dpdk/include/odp/classification.h
new file mode 120000
index 0000000..07861de
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/classification.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/classification.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/compiler.h b/platform/linux-dpdk/include/odp/compiler.h
new file mode 120000
index 0000000..abb67e9
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/compiler.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/compiler.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/config.h b/platform/linux-dpdk/include/odp/config.h
new file mode 120000
index 0000000..094a6ef
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/config.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/config.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/cpu.h b/platform/linux-dpdk/include/odp/cpu.h
new file mode 120000
index 0000000..864c1b8
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/cpu.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/cpu.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/cpumask.h b/platform/linux-dpdk/include/odp/cpumask.h
new file mode 120000
index 0000000..e204c03
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/cpumask.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/cpumask.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/crypto.h b/platform/linux-dpdk/include/odp/crypto.h
new file mode 120000
index 0000000..1d4a2fe
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/crypto.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/crypto.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/debug.h b/platform/linux-dpdk/include/odp/debug.h
new file mode 120000
index 0000000..26d37e7
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/debug.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/debug.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/errno.h b/platform/linux-dpdk/include/odp/errno.h
new file mode 120000
index 0000000..f364724
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/errno.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/errno.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/event.h b/platform/linux-dpdk/include/odp/event.h
new file mode 120000
index 0000000..bbd910e
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/event.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/event.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/hints.h b/platform/linux-dpdk/include/odp/hints.h
new file mode 120000
index 0000000..e3b907d
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/hints.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/hints.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/init.h b/platform/linux-dpdk/include/odp/init.h
new file mode 120000
index 0000000..ae33313
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/init.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/init.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/packet_io.h b/platform/linux-dpdk/include/odp/packet_io.h
new file mode 120000
index 0000000..047d38b
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/packet_io.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/packet_io.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/atomic_types.h b/platform/linux-dpdk/include/odp/plat/atomic_types.h
new file mode 120000
index 0000000..a8daba3
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/atomic_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/atomic_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/barrier_types.h b/platform/linux-dpdk/include/odp/plat/barrier_types.h
new file mode 120000
index 0000000..a8ed100
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/barrier_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/barrier_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/byteorder_types.h b/platform/linux-dpdk/include/odp/plat/byteorder_types.h
new file mode 120000
index 0000000..27d0dea
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/byteorder_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/byteorder_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/classification_types.h b/platform/linux-dpdk/include/odp/plat/classification_types.h
new file mode 120000
index 0000000..445fe79
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/classification_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/classification_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/cpumask_types.h b/platform/linux-dpdk/include/odp/plat/cpumask_types.h
new file mode 120000
index 0000000..97af9b4
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/cpumask_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/cpumask_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/crypto_types.h b/platform/linux-dpdk/include/odp/plat/crypto_types.h
new file mode 120000
index 0000000..5684a3d
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/crypto_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/crypto_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/packet_io_types.h b/platform/linux-dpdk/include/odp/plat/packet_io_types.h
new file mode 120000
index 0000000..6f402f7
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/packet_io_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/packet_io_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/pool_types.h b/platform/linux-dpdk/include/odp/plat/pool_types.h
new file mode 120000
index 0000000..11b62d9
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/pool_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/pool_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/queue_types.h b/platform/linux-dpdk/include/odp/plat/queue_types.h
new file mode 120000
index 0000000..a9db067
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/queue_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/queue_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/rwlock_types.h b/platform/linux-dpdk/include/odp/plat/rwlock_types.h
new file mode 120000
index 0000000..e7eb3d5
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/rwlock_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/rwlock_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/schedule_types.h b/platform/linux-dpdk/include/odp/plat/schedule_types.h
new file mode 120000
index 0000000..eac7b14
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/schedule_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/schedule_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/shared_memory_types.h b/platform/linux-dpdk/include/odp/plat/shared_memory_types.h
new file mode 120000
index 0000000..e910778
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/shared_memory_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/shared_memory_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/spinlock_types.h b/platform/linux-dpdk/include/odp/plat/spinlock_types.h
new file mode 120000
index 0000000..73c82f5
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/spinlock_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/spinlock_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/strong_types.h b/platform/linux-dpdk/include/odp/plat/strong_types.h
new file mode 120000
index 0000000..e670f6f
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/strong_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/strong_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/thrmask_types.h b/platform/linux-dpdk/include/odp/plat/thrmask_types.h
new file mode 120000
index 0000000..df3a0a9
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/thrmask_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/thrmask_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/ticketlock_types.h b/platform/linux-dpdk/include/odp/plat/ticketlock_types.h
new file mode 120000
index 0000000..4d15866
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/ticketlock_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/ticketlock_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/timer_types.h b/platform/linux-dpdk/include/odp/plat/timer_types.h
new file mode 120000
index 0000000..c52e6b2
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/timer_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/timer_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/plat/version_types.h b/platform/linux-dpdk/include/odp/plat/version_types.h
new file mode 120000
index 0000000..c954fbf
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/plat/version_types.h
@@ -0,0 +1 @@
+../../../../linux-generic/include/odp/plat/version_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/pool.h b/platform/linux-dpdk/include/odp/pool.h
new file mode 120000
index 0000000..39e2511
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/pool.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/pool.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/queue.h b/platform/linux-dpdk/include/odp/queue.h
new file mode 120000
index 0000000..b0130ac
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/queue.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/queue.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/random.h b/platform/linux-dpdk/include/odp/random.h
new file mode 120000
index 0000000..0686ab6
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/random.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/random.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/rwlock.h b/platform/linux-dpdk/include/odp/rwlock.h
new file mode 120000
index 0000000..9b19516
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/rwlock.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/rwlock.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/schedule.h b/platform/linux-dpdk/include/odp/schedule.h
new file mode 120000
index 0000000..7429cfa
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/schedule.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/schedule.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/schedule_types.h b/platform/linux-dpdk/include/odp/schedule_types.h
new file mode 120000
index 0000000..276e495
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/schedule_types.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/schedule_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/shared_memory.h b/platform/linux-dpdk/include/odp/shared_memory.h
new file mode 120000
index 0000000..ceb6b2c
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/shared_memory.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/shared_memory.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/spinlock.h b/platform/linux-dpdk/include/odp/spinlock.h
new file mode 120000
index 0000000..33a3258
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/spinlock.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/spinlock.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/std_types.h b/platform/linux-dpdk/include/odp/std_types.h
new file mode 120000
index 0000000..07d10ad
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/std_types.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/std_types.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/sync.h b/platform/linux-dpdk/include/odp/sync.h
new file mode 120000
index 0000000..be89507
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/sync.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/sync.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/system_info.h b/platform/linux-dpdk/include/odp/system_info.h
new file mode 120000
index 0000000..ab2e485
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/system_info.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/system_info.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/thread.h b/platform/linux-dpdk/include/odp/thread.h
new file mode 120000
index 0000000..561d964
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/thread.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/thread.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/thrmask.h b/platform/linux-dpdk/include/odp/thrmask.h
new file mode 120000
index 0000000..e79d695
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/thrmask.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/thrmask.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/ticketlock.h b/platform/linux-dpdk/include/odp/ticketlock.h
new file mode 120000
index 0000000..7d55285
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/ticketlock.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/ticketlock.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/time.h b/platform/linux-dpdk/include/odp/time.h
new file mode 120000
index 0000000..6fe3f73
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/time.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/time.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/timer.h b/platform/linux-dpdk/include/odp/timer.h
new file mode 120000
index 0000000..2f295e7
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/timer.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/timer.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp/version.h b/platform/linux-dpdk/include/odp/version.h
new file mode 120000
index 0000000..300f842
--- /dev/null
+++ b/platform/linux-dpdk/include/odp/version.h
@@ -0,0 +1 @@
+../../../linux-generic/include/odp/version.h \ No newline at end of file
diff --git a/platform/linux-dpdk/include/odp_packet_internal.h b/platform/linux-dpdk/include/odp_packet_internal.h
index 518245c..45a8b88 100644
--- a/platform/linux-dpdk/include/odp_packet_internal.h
+++ b/platform/linux-dpdk/include/odp_packet_internal.h
@@ -118,6 +118,8 @@ typedef struct {
/* common buffer header */
odp_buffer_hdr_t buf_hdr;
+ odp_pktio_t input; /**< Originating pktio */
+
input_flags_t input_flags;
error_flags_t error_flags;
output_flags_t output_flags;
@@ -134,7 +136,6 @@ typedef struct {
uint32_t l3_len; /**< Layer 3 length */
uint32_t l4_protocol; /**< Parsed L4 protocol */
uint32_t l4_len; /**< Layer 4 length */
- odp_pktio_t input; /**< Originating pktio */
uint32_t uarea_size; /**< User metadata size, it's right after
odp_packet_hdr_t*/
odp_crypto_generic_op_result_t op_result; /**< Result for crypto */
diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4
index 645bcbd..1668195 100644
--- a/platform/linux-dpdk/m4/configure.m4
+++ b/platform/linux-dpdk/m4/configure.m4
@@ -39,8 +39,8 @@ AC_LINK_IFELSE(
)
CFLAGS="$saved_cflags"
-m4_include([platform/linux-generic/m4/odp_pthread.m4])
-m4_include([platform/linux-generic/m4/odp_openssl.m4])
+m4_include([platform/linux-dpdk/m4/odp_pthread.m4])
+m4_include([platform/linux-dpdk/m4/odp_openssl.m4])
AC_CONFIG_FILES([platform/linux-dpdk/Makefile
platform/linux-dpdk/test/Makefile
diff --git a/platform/linux-dpdk/m4/odp_openssl.m4 b/platform/linux-dpdk/m4/odp_openssl.m4
new file mode 120000
index 0000000..94939ea
--- /dev/null
+++ b/platform/linux-dpdk/m4/odp_openssl.m4
@@ -0,0 +1 @@
+../../linux-generic/m4/odp_openssl.m4 \ No newline at end of file
diff --git a/platform/linux-dpdk/m4/odp_pthread.m4 b/platform/linux-dpdk/m4/odp_pthread.m4
new file mode 120000
index 0000000..e24304a
--- /dev/null
+++ b/platform/linux-dpdk/m4/odp_pthread.m4
@@ -0,0 +1 @@
+../../linux-generic/m4/odp_pthread.m4 \ No newline at end of file
diff --git a/platform/linux-dpdk/odp_packet_dpdk.c b/platform/linux-dpdk/odp_packet_dpdk.c
index 64d2f6b..27f08fe 100644
--- a/platform/linux-dpdk/odp_packet_dpdk.c
+++ b/platform/linux-dpdk/odp_packet_dpdk.c
@@ -194,8 +194,6 @@ int recv_pkt_dpdk(pkt_dpdk_t * const pkt_dpdk, odp_packet_t pkt_table[],
(uint16_t)pkt_dpdk->queueid,
(struct rte_mbuf **)pkt_table,
(uint16_t)RTE_MAX(len, min));
- for (i = 0; i < nb_rx; i++)
- _odp_packet_reset_parse(pkt_table[i]);
if (odp_unlikely(min > len)) {
memcpy(saved_pkt_table, pkt_table,
diff --git a/platform/linux-dpdk/odp_packet_io.c b/platform/linux-dpdk/odp_packet_io.c
index 5310ce0..7cb1577 100644
--- a/platform/linux-dpdk/odp_packet_io.c
+++ b/platform/linux-dpdk/odp_packet_io.c
@@ -397,9 +397,10 @@ int odp_pktio_recv(odp_pktio_t id, odp_packet_t pkt_table[], int len)
pkts = deq_loopback(pktio_entry, pkt_table, len);
}
odp_ticketlock_unlock(&pktio_entry->s.rxl);
- if (pkts >= 0)
- for (i = 0; i < pkts; ++i)
- odp_packet_hdr(pkt_table[i])->input = id;
+ for (i = 0; i < pkts; ++i) {
+ odp_packet_hdr(pkt_table[i])->input = id;
+ _odp_packet_reset_parse(pkt_table[i]);
+ }
return pkts;
}