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, api-next has been updated via f759631fb9c373804caeaee27c5ad7de3405e55b (commit) via 320bb2e9a29256de37bfdb10b9dde3fd0f0d4a5d (commit) via 65d66b94d66e6b954f3430b90a67eaeca7bf37c6 (commit) via ba9fedae2040d39f71fa8aee6db9512c5cfe21e4 (commit) via ed2364544979bbb83f68bf61ea15e9fb86e2e994 (commit) via 900c9ca3d4099178a328433d32d84a825264aaa1 (commit) via d660e0e1647d7f1a6c6698b6f1b79b4590b84e1f (commit) via 42d0b99c453f269fbe21cc92652440bdbbd10ba4 (commit) via d25d276c649f57021f2bd3575430735ff146a025 (commit) via 4cfe988cc6e0667928c23a4715eeac8a301396ac (commit) via 290b6f6464a81d65333657dfff7922203614748c (commit) via 2f78516616ba40cfa316c739816ef34ef7924a49 (commit) from f0d6c01a0fb51904d5dd049be8402531ec185dcc (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 f759631fb9c373804caeaee27c5ad7de3405e55b Merge: f0d6c01 320bb2e Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Fri Dec 9 18:10:22 2016 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --cc platform/linux-generic/odp_traffic_mngr.c index 6a660c5,32702d2..4a09da1 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@@ -1878,10 -1861,18 +1879,11 @@@ static int tm_enqueue(tm_system_t *tm_s odp_bool_t drop_eligible, drop; uint32_t frame_len, pkt_depth; int rc; - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - - /* If we're from an ordered queue and not in order - * record the event and wait until order is resolved - */ - if (queue_tm_reorder(&tm_queue_obj->tm_qentry, &pkt_hdr->buf_hdr)) - return 0;
- if (tm_system->first_enq == 0) { - odp_barrier_wait(&tm_system->tm_system_barrier); - tm_system->first_enq = 1; + tm_group = GET_TM_GROUP(tm_system->odp_tm_group); + if (tm_group->first_enq == 0) { + odp_barrier_wait(&tm_group->tm_group_barrier); + tm_group->first_enq = 1; }
pkt_color = odp_packet_color(pkt);
-----------------------------------------------------------------------
Summary of changes: CHANGELOG | 177 +++++++++++++++++++++ configure.ac | 26 +-- helper/linux.c | 1 - .../include/odp_traffic_mngr_internal.h | 3 +- platform/linux-generic/odp_cpumask.c | 73 +++------ platform/linux-generic/odp_traffic_mngr.c | 12 +- test/common_plat/validation/api/packet/packet.c | 56 +++---- test/common_plat/validation/api/pktio/pktio.c | 10 +- .../validation/api/traffic_mngr/traffic_mngr.c | 116 ++++++++------ 9 files changed, 320 insertions(+), 154 deletions(-)
hooks/post-receive