diff options
| author | Petri Savolainen <petri.savolainen@nokia.com> | 2016-01-28 15:24:38 +0200 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2016-02-08 20:45:25 +0300 |
| commit | 295f4263dab07eb817772b96b6576354d5419903 (patch) | |
| tree | e2cae63240877a3cf646a97345f59352192e6e17 /platform | |
| parent | 851d535641d8a037af0d0c7ca1466c901cf5001e (diff) | |
api: pktio: rename pktio modes
Aligned pktin and pktout modes with renamed queue types in
the following way:
ODP_PKTIN_MODE_RECV to ODP_PKTIN_MODE_DIRECT
ODP_PKTIN_MODE_POLL to ODP_PKTIN_MODE_QUEUE
ODP_PKTIN_MODE_SCHED was not renamed
ODP_PKTOUT_MODE_SEND to ODP_PKTOUT_MODE_DIRECT
Direct pktio modes (_RECV/_SEND) are renamed to _DIRECT, which
is future proof to support additional direct calls for packet
input/output.
Signed-off-by: Petri Savolainen <petri.savolainen@nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linux-generic/odp_packet_io.c | 12 | ||||
| -rw-r--r-- | platform/linux-generic/pktio/netmap.c | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 60d74f77a..c5c87892a 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1086,7 +1086,7 @@ int odp_pktio_input_queues_config(odp_pktio_t pktio, destroy_in_queues(entry, entry->s.num_in_queue); for (i = 0; i < num_queues; i++) { - if (mode == ODP_PKTIN_MODE_POLL || + if (mode == ODP_PKTIN_MODE_QUEUE || mode == ODP_PKTIN_MODE_SCHED) { odp_queue_type_t type = ODP_QUEUE_TYPE_PLAIN; @@ -1104,7 +1104,7 @@ int odp_pktio_input_queues_config(odp_pktio_t pktio, return -1; } - if (mode == ODP_PKTIN_MODE_POLL) { + if (mode == ODP_PKTIN_MODE_QUEUE) { queue_entry_t *qentry; qentry = queue_to_qentry(queue); @@ -1166,7 +1166,7 @@ int odp_pktio_output_queues_config(odp_pktio_t pktio, return -1; } - if (mode != ODP_PKTOUT_MODE_SEND) { + if (mode != ODP_PKTOUT_MODE_DIRECT) { ODP_DBG("pktio %s: bad packet output mode\n", entry->s.name); return -1; } @@ -1211,7 +1211,7 @@ int odp_pktio_in_queues(odp_pktio_t pktio, odp_queue_t queues[], int num) mode = entry->s.param.in_mode; - if (mode != ODP_PKTIN_MODE_POLL && + if (mode != ODP_PKTIN_MODE_QUEUE && mode != ODP_PKTIN_MODE_SCHED) return -1; @@ -1235,7 +1235,7 @@ int odp_pktio_pktin_queues(odp_pktio_t pktio, odp_pktin_queue_t queues[], mode = entry->s.param.in_mode; - if (mode != ODP_PKTIN_MODE_RECV) + if (mode != ODP_PKTIN_MODE_DIRECT) return -1; if (entry->s.ops->pktin_queues) @@ -1258,7 +1258,7 @@ int odp_pktio_pktout_queues(odp_pktio_t pktio, odp_pktout_queue_t queues[], mode = entry->s.param.out_mode; - if (mode != ODP_PKTOUT_MODE_SEND) + if (mode != ODP_PKTOUT_MODE_DIRECT) return -1; if (entry->s.ops->pktout_queues) diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 16898ecc9..e406f6930 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -392,7 +392,8 @@ static int netmap_start(pktio_entry_t *pktio_entry) ¶m)) return -1; } - if (!pktio_entry->s.num_out_queue && out_mode == ODP_PKTOUT_MODE_SEND) { + if (!pktio_entry->s.num_out_queue && + out_mode == ODP_PKTOUT_MODE_DIRECT) { odp_pktio_output_queue_param_t param; odp_pktio_output_queue_param_init(¶m); |