This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via dd0498bb104c7319e2ec56b61e4d585167ea6c53 (commit) from e826613858543e50a2ec74598f8c2c6fd4bfa064 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit dd0498bb104c7319e2ec56b61e4d585167ea6c53 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Wed Oct 18 18:28:51 2017 +0300
linux-gen: pktio: ignore num_queues parameter if classifier enabled
Api defines statemet: "When classifier is enabled in odp_pktin_queue_config() this value is ignored, otherwise at least one queue is required." https://bugs.linaro.org/show_bug.cgi?id=3289
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index f972bb78..0473483d 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1228,13 +1228,13 @@ int odp_pktin_queue_config(odp_pktio_t pktio, if (mode == ODP_PKTIN_MODE_DISABLED) return 0;
- num_queues = param->num_queues; - - if (num_queues == 0) { - ODP_DBG("pktio %s: zero input queues\n", entry->s.name); + if (!param->classifier_enable && param->num_queues == 0) { + ODP_DBG("invalid num_queues for operation mode\n"); return -1; }
+ num_queues = param->classifier_enable ? 1 : param->num_queues; + rc = odp_pktio_capability(pktio, &capa); if (rc) { ODP_DBG("pktio %s: unable to read capabilities\n", @@ -1263,8 +1263,11 @@ int odp_pktin_queue_config(odp_pktio_t pktio, snprintf(name, sizeof(name), "odp-pktin-%i-%i", pktio_id, i);
- memcpy(&queue_param, ¶m->queue_param, - sizeof(odp_queue_param_t)); + if (param->classifier_enable) + odp_queue_param_init(&queue_param); + else + memcpy(&queue_param, ¶m->queue_param, + sizeof(odp_queue_param_t));
queue_param.type = ODP_QUEUE_TYPE_PLAIN;
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/odp_packet_io.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
hooks/post-receive