mbuf: add new Rx checksum flags

[dpdk.git] / app / test-pmd / csumonly.c

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index d51d85a..da15185 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -336,7 +336,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
        if (!info->is_tunnel) {
                max_pkt_len = info->l2_len + info->l3_len + info->l4_len +
                        info->tso_segsz;
-               if (info->tunnel_tso_segsz != 0 && info->pkt_len > max_pkt_len)
+               if (info->tso_segsz != 0 && info->pkt_len > max_pkt_len)
                        tso_segsz = info->tso_segsz;
        } else {
                max_pkt_len = info->outer_l2_len + info->outer_l3_len +
@@ -351,9 +351,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
                ipv4_hdr->hdr_checksum = 0;
 
                ol_flags |= PKT_TX_IPV4;
-               if (info->l4_proto == IPPROTO_TCP &&
-                   ((info->is_tunnel && info->tunnel_tso_segsz != 0) ||
-                    (!info->is_tunnel && info->tso_segsz != 0))) {
+               if (info->l4_proto == IPPROTO_TCP && tso_segsz) {
                        ol_flags |= PKT_TX_IP_CKSUM;
                } else {
                        if (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM)
@@ -699,8 +697,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
                rx_ol_flags = m->ol_flags;
 
                /* Update the L3/L4 checksum error packet statistics */
-               rx_bad_ip_csum += ((rx_ol_flags & PKT_RX_IP_CKSUM_BAD) != 0);
-               rx_bad_l4_csum += ((rx_ol_flags & PKT_RX_L4_CKSUM_BAD) != 0);
+               if ((rx_ol_flags & PKT_RX_IP_CKSUM_MASK) == PKT_RX_IP_CKSUM_BAD)
+                       rx_bad_ip_csum += 1;
+               if ((rx_ol_flags & PKT_RX_L4_CKSUM_MASK) == PKT_RX_L4_CKSUM_BAD)
+                       rx_bad_l4_csum += 1;
 
                /* step 1: dissect packet, parsing optional vlan, ip4/ip6, vxlan
                 * and inner headers */
@@ -843,10 +843,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
                                                "m->outer_l3_len=%d\n",
                                                m->outer_l2_len,
                                                m->outer_l3_len);
-                               if (info.tunnel_tso_segsz != 0)
+                               if (info.tunnel_tso_segsz != 0 &&
+                                               (m->ol_flags & PKT_TX_TCP_SEG))
                                        printf("tx: m->tso_segsz=%d\n",
                                                m->tso_segsz);
-                       } else if (info.tso_segsz != 0)
+                       } else if (info.tso_segsz != 0 &&
+                                       (m->ol_flags & PKT_TX_TCP_SEG))
                                printf("tx: m->tso_segsz=%d\n", m->tso_segsz);
                        rte_get_tx_ol_flag_list(m->ol_flags, buf, sizeof(buf));
                        printf("tx: flags=%s", buf);