From: Dmitry Eremin-Solenikov <[email protected]>
Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
---
/** Email created from pull request 108 (lumag:symbols-cleanup)
** https://github.com/Linaro/odp/pull/108
** Patch: https://github.com/Linaro/odp/pull/108.patch
** Base sha: 8390f890d4bd2babb63a24f7b15d2f4763e44050
** Merge commit sha: 44fd671a0d2772a32395c7f0574aa545d2a9aa71
**/
.../linux-generic/include/odp_packet_io_internal.h | 13 -------------
platform/linux-generic/odp_packet_io.c | 21 +++++++++++----------
2 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h
b/platform/linux-generic/include/odp_packet_io_internal.h
index 20a86557..1a4e345f 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -252,19 +252,6 @@ static inline void pktio_cls_enabled_set(pktio_entry_t
*entry, int ena)
entry->s.cls_enabled = ena;
}
-/*
- * Dummy single queue implementations of multi-queue API
- */
-int single_capability(odp_pktio_capability_t *capa);
-int single_input_queues_config(pktio_entry_t *entry,
- const odp_pktin_queue_param_t *param);
-int single_output_queues_config(pktio_entry_t *entry,
- const odp_pktout_queue_param_t *param);
-int single_recv_queue(pktio_entry_t *entry, int index, odp_packet_t packets[],
- int num);
-int single_send_queue(pktio_entry_t *entry, int index,
- const odp_packet_t packets[], int num);
-
extern const pktio_if_ops_t netmap_pktio_ops;
extern const pktio_if_ops_t dpdk_pktio_ops;
extern const pktio_if_ops_t sock_mmsg_pktio_ops;
diff --git a/platform/linux-generic/odp_packet_io.c
b/platform/linux-generic/odp_packet_io.c
index 709f9c23..3a5d6d5d 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -1070,6 +1070,17 @@ int odp_pktio_term_global(void)
return ret;
}
+static
+int single_capability(odp_pktio_capability_t *capa)
+{
+ memset(capa, 0, sizeof(odp_pktio_capability_t));
+ capa->max_input_queues = 1;
+ capa->max_output_queues = 1;
+ capa->set_op.op.promisc_mode = 1;
+
+ return 0;
+}
+
int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa)
{
pktio_entry_t *entry;
@@ -1673,13 +1684,3 @@ int odp_pktout_send(odp_pktout_queue_t queue, const
odp_packet_t packets[],
return entry->s.ops->send(entry, queue.index, packets, num);
}
-
-int single_capability(odp_pktio_capability_t *capa)
-{
- memset(capa, 0, sizeof(odp_pktio_capability_t));
- capa->max_input_queues = 1;
- capa->max_output_queues = 1;
- capa->set_op.op.promisc_mode = 1;
-
- return 0;
-}