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 552817483e9d4b6a84d49960920f1de50029f111 (commit) via c5eb1703fe9e7529ae12ecf1799b757e1a992afd (commit) via ea134fe159c0d249e4bed12b7269e8236afa0262 (commit) via 60b9dd435bf1be55794e5be6ee24714d28a5b587 (commit) from 2e36f75db71b230021cd907a5aadf39559683d16 (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 552817483e9d4b6a84d49960920f1de50029f111 Merge: 2e36f75d c5eb1703 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Thu May 25 15:43:39 2017 +0300
Merge branch 'master' into api-next
diff --cc example/generator/odp_generator.c index afa79270,3ec7d8d1..9336cec1 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@@ -635,28 -664,10 +664,10 @@@ static void print_pkts(int thr, odp_pac }
/* icmp */ - if (ip->proto == ODPH_IPPROTO_ICMP) { + if (ip->proto == ODPH_IPPROTO_ICMPv4) { icmp = (odph_icmphdr_t *)(buf + offset); - /* echo reply */ - if (icmp->type == ICMP_ECHOREPLY) { - odp_atomic_inc_u64(&counters.icmp); - memcpy(&tvsend, buf + offset + ODPH_ICMPHDR_LEN, - sizeof(struct timeval)); - /* TODO This should be changed to use an - * ODP timer API once one exists. */ - gettimeofday(&tvrecv, NULL); - tv_sub(&tvrecv, &tvsend); - rtt = tvrecv.tv_sec*1000 + tvrecv.tv_usec/1000; - rlen += sprintf(msg + rlen, - "ICMP Echo Reply seq %d time %.1f ", - odp_be_to_cpu_16(icmp->un.echo.sequence) - , rtt); - } else if (icmp->type == ICMP_ECHO) { - rlen += sprintf(msg + rlen, - "Icmp Echo Request"); - }
- msg[rlen] = '\0'; + process_icmp_pkt(icmp, msg); printf(" [%02i] %s\n", thr, msg); } }
-----------------------------------------------------------------------
Summary of changes: example/generator/odp_generator.c | 89 ++++++++++++--------------- platform/linux-generic/odp_packet_io.c | 8 +++ platform/linux-generic/odp_queue.c | 1 + platform/linux-generic/odp_schedule.c | 5 +- platform/linux-generic/odp_schedule_iquery.c | 5 +- test/linux-generic/pktio_ipc/pktio_ipc_run.sh | 3 - 6 files changed, 58 insertions(+), 53 deletions(-)
hooks/post-receive