power: add bit for high frequency cores

[dpdk.git] / lib / librte_net / rte_ip.h

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 72dc245..f9b9090 100644 (file)
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -108,25 +108,25 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
        /* workaround gcc strict-aliasing warning */
        uintptr_t ptr = (uintptr_t)buf;
        typedef uint16_t __attribute__((__may_alias__)) u16_p;
-       const u16_p *u16 = (const u16_p *)ptr;
-
-       while (len >= (sizeof(*u16) * 4)) {
-               sum += u16[0];
-               sum += u16[1];
-               sum += u16[2];
-               sum += u16[3];
-               len -= sizeof(*u16) * 4;
-               u16 += 4;
+       const u16_p *u16_buf = (const u16_p *)ptr;
+
+       while (len >= (sizeof(*u16_buf) * 4)) {
+               sum += u16_buf[0];
+               sum += u16_buf[1];
+               sum += u16_buf[2];
+               sum += u16_buf[3];
+               len -= sizeof(*u16_buf) * 4;
+               u16_buf += 4;
        }
-       while (len >= sizeof(*u16)) {
-               sum += *u16;
-               len -= sizeof(*u16);
-               u16 += 1;
+       while (len >= sizeof(*u16_buf)) {
+               sum += *u16_buf;
+               len -= sizeof(*u16_buf);
+               u16_buf += 1;
        }
 
        /* if length is in odd bytes */
        if (len == 1)
-               sum += *((const uint8_t *)u16);
+               sum += *((const uint8_t *)u16_buf);
 
        return sum;
 }
@@ -310,16 +310,20 @@ rte_ipv4_phdr_cksum(const struct ipv4_hdr *ipv4_hdr, uint64_t ol_flags)
  * @param l4_hdr
  *   The pointer to the beginning of the L4 header.
  * @return
- *   The complemented checksum to set in the IP packet.
+ *   The complemented checksum to set in the IP packet
+ *   or 0 on error
  */
 static inline uint16_t
 rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr)
 {
        uint32_t cksum;
-       uint32_t l4_len;
+       uint32_t l3_len, l4_len;
+
+       l3_len = rte_be_to_cpu_16(ipv4_hdr->total_length);
+       if (l3_len < sizeof(struct ipv4_hdr))
+               return 0;
 
-       l4_len = (uint32_t)(rte_be_to_cpu_16(ipv4_hdr->total_length) -
-               sizeof(struct ipv4_hdr));
+       l4_len = l3_len - sizeof(struct ipv4_hdr);
 
        cksum = rte_raw_cksum(l4_hdr, l4_len);
        cksum += rte_ipv4_phdr_cksum(ipv4_hdr, 0);