examples/tep_term: fix inner L4 checksum

[dpdk.git] / examples / tep_termination / vxlan.c

diff --git a/examples/tep_termination/vxlan.c b/examples/tep_termination/vxlan.c
index e98a29f..155415c 100644 (file)
--- a/examples/tep_termination/vxlan.c
+++ b/examples/tep_termination/vxlan.c
@@ -141,14 +141,17 @@ process_inner_cksums(struct ether_hdr *eth_hdr, union tunnel_offload_info *info)
                                ethertype, ol_flags);
        } else if (l4_proto == IPPROTO_TCP) {
                tcp_hdr = (struct tcp_hdr *)((char *)l3_hdr + info->l3_len);
-               ol_flags |= PKT_TX_TCP_CKSUM;
-               tcp_hdr->cksum = get_psd_sum(l3_hdr, ethertype,
-                               ol_flags);
+               /* Put PKT_TX_TCP_SEG bit setting before get_psd_sum(), because
+                * it depends on PKT_TX_TCP_SEG to calculate pseudo-header
+                * checksum.
+                */
                if (tso_segsz != 0) {
                        ol_flags |= PKT_TX_TCP_SEG;
                        info->tso_segsz = tso_segsz;
                        info->l4_len = sizeof(struct tcp_hdr);
                }
+               ol_flags |= PKT_TX_TCP_CKSUM;
+               tcp_hdr->cksum = get_psd_sum(l3_hdr, ethertype, ol_flags);
 
        } else if (l4_proto == IPPROTO_SCTP) {
                sctp_hdr = (struct sctp_hdr *)((char *)l3_hdr + info->l3_len);
@@ -180,12 +183,7 @@ decapsulation(struct rte_mbuf *pkt)
         * (rfc7348) or that the rx offload flag is set (i40e only
         * currently)*/
        if (udp_hdr->dst_port != rte_cpu_to_be_16(DEFAULT_VXLAN_PORT) &&
-#ifdef RTE_NEXT_ABI
                (pkt->packet_type & RTE_PTYPE_TUNNEL_MASK) == 0)
-#else
-                       (pkt->ol_flags & (PKT_RX_TUNNEL_IPV4_HDR |
-                               PKT_RX_TUNNEL_IPV6_HDR)) == 0)
-#endif
                return -1;
        outer_header_len = info.outer_l2_len + info.outer_l3_len
                + sizeof(struct udp_hdr) + sizeof(struct vxlan_hdr);
@@ -242,6 +240,8 @@ encapsulation(struct rte_mbuf *m, uint8_t queue_id)
        m->outer_l2_len = sizeof(struct ether_hdr);
        m->outer_l3_len = sizeof(struct ipv4_hdr);
 
+       ol_flags |= PKT_TX_TUNNEL_VXLAN;
+
        m->ol_flags |= ol_flags;
        m->tso_segsz = tx_offload.tso_segsz;