| Message ID | 1398759183-17547-1-git-send-email-weilong.chen@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
Hi Weilong, Ola's comment is not addressed in this version also. Please fix it. Thank you, Maxim. On 04/29/2014 12:13 PM, Weilong Chen wrote: > Signed-off-by: Weilong Chen <weilong.chen@linaro.org> > --- > include/helper/odp_udp.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 55 insertions(+) > > diff --git a/include/helper/odp_udp.h b/include/helper/odp_udp.h > index 738470e..257db5f 100644 > --- a/include/helper/odp_udp.h > +++ b/include/helper/odp_udp.h > @@ -33,6 +33,61 @@ typedef struct ODP_PACKED { > uint16be_t chksum; /**< UDP header and data checksum (0 if not used)*/ > } odp_udphdr_t; > > +/** > +* UDP checksum > +* > +* This function uses odp packet to calc checksum > +* > +*/ > +static inline uint16be_t odp_ipv4_udp_chksum(odp_packet_t pkt) > +{ > + unsigned long sum = 0; > + odp_udphdr_t *udph; > + odp_ipv4hdr_t *iph; > + unsigned short *buf; > + unsigned short udplen; > + > + if (!odp_packet_l3_offset(pkt)) > + return 0; > + > + if (!odp_packet_l4_offset(pkt)) > + return 0; > + > + iph = (odp_ipv4hdr_t *)odp_packet_l3(pkt); > + udph = (odp_udphdr_t *)odp_packet_l4(pkt); > + buf = (unsigned short *)udph; > + udplen = odp_be_to_cpu_16(udph->length); > + > + /* the source ip */ > + sum += (iph->src_addr >> 16) & 0xFFFF; > + sum += (iph->src_addr) & 0xFFFF; > + /* the dest ip */ > + sum += (iph->dst_addr >> 16) & 0xFFFF; > + sum += (iph->dst_addr) & 0xFFFF; > + sum += odp_cpu_to_be_16(ODP_IPPROTO_UDP); > + /* the length */ > + sum += udph->length; > + > + /* initialize checksum to 0 */ > + udph->chksum = 0; > + while (udplen > 1) { > + sum += *buf++; > + udplen -= 2; > + } > + /* if any bytes left, pad the bytes and add */ > + if (udplen > 0) > + sum += ((*buf)&odp_cpu_to_be_16(0xFF00)); > + > + /* Fold sum to 16 bits: add carrier to result */ > + while (sum >> 16) > + sum = (sum & 0xFFFF) + (sum >> 16); > + sum = ~sum; > + /* set computation result */ > + udph->chksum = ((unsigned short)sum == 0x0) ? 0xFFFF > + : (unsigned short)sum; > + > + return udph->chksum; > +} > > /** @internal Compile time assert */ > ODP_ASSERT(sizeof(odp_udphdr_t) == ODP_UDPHDR_LEN, ODP_UDPHDR_T__SIZE_ERROR);
Sorry, I missed it On 29 April 2014 16:55, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > Hi Weilong, > > Ola's comment is not addressed in this version also. Please fix it. > > Thank you, > Maxim. > > > On 04/29/2014 12:13 PM, Weilong Chen wrote: > >> Signed-off-by: Weilong Chen <weilong.chen@linaro.org> >> --- >> include/helper/odp_udp.h | 55 ++++++++++++++++++++++++++++++ >> ++++++++++++++++ >> 1 file changed, 55 insertions(+) >> >> diff --git a/include/helper/odp_udp.h b/include/helper/odp_udp.h >> index 738470e..257db5f 100644 >> --- a/include/helper/odp_udp.h >> +++ b/include/helper/odp_udp.h >> @@ -33,6 +33,61 @@ typedef struct ODP_PACKED { >> uint16be_t chksum; /**< UDP header and data checksum (0 if not >> used)*/ >> } odp_udphdr_t; >> +/** >> +* UDP checksum >> +* >> +* This function uses odp packet to calc checksum >> +* >> +*/ >> +static inline uint16be_t odp_ipv4_udp_chksum(odp_packet_t pkt) >> +{ >> + unsigned long sum = 0; >> + odp_udphdr_t *udph; >> + odp_ipv4hdr_t *iph; >> + unsigned short *buf; >> + unsigned short udplen; >> + >> + if (!odp_packet_l3_offset(pkt)) >> + return 0; >> + >> + if (!odp_packet_l4_offset(pkt)) >> + return 0; >> + >> + iph = (odp_ipv4hdr_t *)odp_packet_l3(pkt); >> + udph = (odp_udphdr_t *)odp_packet_l4(pkt); >> + buf = (unsigned short *)udph; >> + udplen = odp_be_to_cpu_16(udph->length); >> + >> + /* the source ip */ >> + sum += (iph->src_addr >> 16) & 0xFFFF; >> + sum += (iph->src_addr) & 0xFFFF; >> + /* the dest ip */ >> + sum += (iph->dst_addr >> 16) & 0xFFFF; >> + sum += (iph->dst_addr) & 0xFFFF; >> + sum += odp_cpu_to_be_16(ODP_IPPROTO_UDP); >> + /* the length */ >> + sum += udph->length; >> + >> + /* initialize checksum to 0 */ >> + udph->chksum = 0; >> + while (udplen > 1) { >> + sum += *buf++; >> + udplen -= 2; >> + } >> + /* if any bytes left, pad the bytes and add */ >> + if (udplen > 0) >> + sum += ((*buf)&odp_cpu_to_be_16(0xFF00)); >> + >> + /* Fold sum to 16 bits: add carrier to result */ >> + while (sum >> 16) >> + sum = (sum & 0xFFFF) + (sum >> 16); >> + sum = ~sum; >> + /* set computation result */ >> + udph->chksum = ((unsigned short)sum == 0x0) ? 0xFFFF >> + : (unsigned short)sum; >> + >> + return udph->chksum; >> +} >> /** @internal Compile time assert */ >> ODP_ASSERT(sizeof(odp_udphdr_t) == ODP_UDPHDR_LEN, >> ODP_UDPHDR_T__SIZE_ERROR); >> > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
diff --git a/include/helper/odp_udp.h b/include/helper/odp_udp.h index 738470e..257db5f 100644 --- a/include/helper/odp_udp.h +++ b/include/helper/odp_udp.h @@ -33,6 +33,61 @@ typedef struct ODP_PACKED { uint16be_t chksum; /**< UDP header and data checksum (0 if not used)*/ } odp_udphdr_t; +/** +* UDP checksum +* +* This function uses odp packet to calc checksum +* +*/ +static inline uint16be_t odp_ipv4_udp_chksum(odp_packet_t pkt) +{ + unsigned long sum = 0; + odp_udphdr_t *udph; + odp_ipv4hdr_t *iph; + unsigned short *buf; + unsigned short udplen; + + if (!odp_packet_l3_offset(pkt)) + return 0; + + if (!odp_packet_l4_offset(pkt)) + return 0; + + iph = (odp_ipv4hdr_t *)odp_packet_l3(pkt); + udph = (odp_udphdr_t *)odp_packet_l4(pkt); + buf = (unsigned short *)udph; + udplen = odp_be_to_cpu_16(udph->length); + + /* the source ip */ + sum += (iph->src_addr >> 16) & 0xFFFF; + sum += (iph->src_addr) & 0xFFFF; + /* the dest ip */ + sum += (iph->dst_addr >> 16) & 0xFFFF; + sum += (iph->dst_addr) & 0xFFFF; + sum += odp_cpu_to_be_16(ODP_IPPROTO_UDP); + /* the length */ + sum += udph->length; + + /* initialize checksum to 0 */ + udph->chksum = 0; + while (udplen > 1) { + sum += *buf++; + udplen -= 2; + } + /* if any bytes left, pad the bytes and add */ + if (udplen > 0) + sum += ((*buf)&odp_cpu_to_be_16(0xFF00)); + + /* Fold sum to 16 bits: add carrier to result */ + while (sum >> 16) + sum = (sum & 0xFFFF) + (sum >> 16); + sum = ~sum; + /* set computation result */ + udph->chksum = ((unsigned short)sum == 0x0) ? 0xFFFF + : (unsigned short)sum; + + return udph->chksum; +} /** @internal Compile time assert */ ODP_ASSERT(sizeof(odp_udphdr_t) == ODP_UDPHDR_LEN, ODP_UDPHDR_T__SIZE_ERROR);
Signed-off-by: Weilong Chen <weilong.chen@linaro.org> --- include/helper/odp_udp.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)