bus/pci: use SPDX tags in 6WIND copyrighted files

[dpdk.git] / lib / librte_gso / gso_tunnel_tcp4.c

diff --git a/lib/librte_gso/gso_tunnel_tcp4.c b/lib/librte_gso/gso_tunnel_tcp4.c
index 5e8c8e5..d39b468 100644 (file)
--- a/lib/librte_gso/gso_tunnel_tcp4.c
+++ b/lib/librte_gso/gso_tunnel_tcp4.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2017 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) 2017 Intel Corporation
  */
 
 #include "gso_common.h"
@@ -42,11 +13,13 @@ update_tunnel_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta,
        struct tcp_hdr *tcp_hdr;
        uint32_t sent_seq;
        uint16_t outer_id, inner_id, tail_idx, i;
-       uint16_t outer_ipv4_offset, inner_ipv4_offset, udp_offset, tcp_offset;
+       uint16_t outer_ipv4_offset, inner_ipv4_offset;
+       uint16_t udp_gre_offset, tcp_offset;
+       uint8_t update_udp_hdr;
 
        outer_ipv4_offset = pkt->outer_l2_len;
-       udp_offset = outer_ipv4_offset + pkt->outer_l3_len;
-       inner_ipv4_offset = udp_offset + pkt->l2_len;
+       udp_gre_offset = outer_ipv4_offset + pkt->outer_l3_len;
+       inner_ipv4_offset = udp_gre_offset + pkt->l2_len;
        tcp_offset = inner_ipv4_offset + pkt->l3_len;
 
        /* Outer IPv4 header. */
@@ -63,9 +36,13 @@ update_tunnel_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta,
        sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq);
        tail_idx = nb_segs - 1;
 
+       /* Only update UDP header for VxLAN packets. */
+       update_udp_hdr = (pkt->ol_flags & PKT_TX_TUNNEL_VXLAN) ? 1 : 0;
+
        for (i = 0; i < nb_segs; i++) {
                update_ipv4_header(segs[i], outer_ipv4_offset, outer_id);
-               update_udp_header(segs[i], udp_offset);
+               if (update_udp_hdr)
+                       update_udp_header(segs[i], udp_gre_offset);
                update_ipv4_header(segs[i], inner_ipv4_offset, inner_id);
                update_tcp_header(segs[i], tcp_offset, sent_seq, i < tail_idx);
                outer_id++;