diff options
author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2017-11-20 17:41:02 +0300 |
---|---|---|
committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2017-12-27 21:41:46 +0300 |
commit | b742308f29903a494870840085e4a32ba7c6980b (patch) | |
tree | ce20e280e4dd72a080f219725808090914c04079 /example | |
parent | 69de1a1603356f790de61c7beda2f9b0a1f8db94 (diff) |
example: switch to using ODP chksum API
ODP now provides odp_chksum_ones_comp16, switch examples to use it
instead of odph_chksum helper function.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'example')
-rw-r--r-- | example/generator/odp_generator.c | 7 | ||||
-rw-r--r-- | example/ipsec/odp_ipsec_stream.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 861e98369..cea20b8e0 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -369,7 +369,7 @@ static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg, ip->id = odp_cpu_to_be_16(seq); if (!pktout_cfg->bit.ipv4_chksum) { ip->chksum = 0; - ip->chksum = odph_chksum(ip, ODPH_IPV4HDR_LEN); + ip->chksum = ~odp_chksum_ones_comp16(ip, ODPH_IPV4HDR_LEN); } if (pktout_cfg->bit.ipv4_chksum || pktout_cfg->bit.udp_chksum) { @@ -469,7 +469,7 @@ static int setup_icmp_pkt(odp_packet_t pkt, ip->id = odp_cpu_to_be_16(seq); if (!pktout_cfg->bit.ipv4_chksum) { ip->chksum = 0; - ip->chksum = odph_chksum(ip, ODPH_IPV4HDR_LEN); + ip->chksum = ~odp_chksum_ones_comp16(ip, ODPH_IPV4HDR_LEN); } /* icmp */ @@ -482,7 +482,8 @@ static int setup_icmp_pkt(odp_packet_t pkt, memcpy(tval_d, &tval, sizeof(uint64_t)); icmp->chksum = 0; - icmp->chksum = odph_chksum(icmp, args->appl.payload + ODPH_ICMPHDR_LEN); + icmp->chksum = ~odp_chksum_ones_comp16(icmp, args->appl.payload + + ODPH_ICMPHDR_LEN); if (pktout_cfg->bit.ipv4_chksum) { odp_packet_l2_offset_set(pkt, 0); diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index e37fbee29..bc5d572f0 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -269,7 +269,8 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, inner_ip->frag_offset = 0; inner_ip->src_addr = odp_cpu_to_be_32(stream->src_ip); inner_ip->dst_addr = odp_cpu_to_be_32(stream->dst_ip); - inner_ip->chksum = odph_chksum(inner_ip, sizeof(*inner_ip)); + inner_ip->chksum = ~odp_chksum_ones_comp16(inner_ip, + sizeof(*inner_ip)); data += sizeof(*inner_ip); } @@ -290,7 +291,7 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, /* Close ICMP */ icmp->chksum = 0; - icmp->chksum = odph_chksum(icmp, data - (uint8_t *)icmp); + icmp->chksum = ~odp_chksum_ones_comp16(icmp, data - (uint8_t *)icmp); /* Close ESP if specified */ if (esp) { |