New upstream version 18.02

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

diff --git a/examples/tep_termination/vxlan.c b/examples/tep_termination/vxlan.c
index 9142c8d..7732821 100644 (file)
--- a/examples/tep_termination/vxlan.c
+++ b/examples/tep_termination/vxlan.c
@@ -1,35 +1,7 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2015 Intel Corporation
  */
+
 #include <stdint.h>
 #include <rte_mbuf.h>
 #include <rte_hash_crc.h>
@@ -141,14 +113,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 = (tcp_hdr->data_off & 0xf0) >> 2;
                }
+               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);
@@ -237,6 +212,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;